From: Cédric Aguerre <cedric.aguerre@edf.fr>
Date: Fri, 22 Jan 2016 08:15:57 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/V8_0_0_BR'
X-Git-Tag: V8_1_0a1~32
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9143e3cf1d22d4d867717fa44d39e7d816a46979;p=modules%2Fmed.git

Merge remote-tracking branch 'origin/V8_0_0_BR'
---

9143e3cf1d22d4d867717fa44d39e7d816a46979
diff --cc src/MEDCalc/cmp/MEDPresentation.cxx
index 846bac683,f84d37eaf..0b03774b5
--- a/src/MEDCalc/cmp/MEDPresentation.cxx
+++ b/src/MEDCalc/cmp/MEDPresentation.cxx
@@@ -91,14 -75,15 +91,14 @@@ PyObject * MEDPresentation::getPythonOb
    return PyDict_GetItemString(global_dict, python_var);
  }
  
- std::string MEDPresentation::getFieldTypeString(ParaMEDMEM::TypeOfField fieldType)
 -std::string MEDPresentation::getFieldTypeString()
++std::string MEDPresentation::getFieldTypeString(MEDCoupling::TypeOfField fieldType)
  {
 -  MEDCoupling::TypeOfField typ = (MEDCoupling::TypeOfField)_fieldHandler->type;
 -  switch(typ)
 +  switch(fieldType)
    {
-     case ParaMEDMEM::ON_CELLS:
+     case MEDCoupling::ON_CELLS:
        return "CELLS";
-     case ParaMEDMEM::ON_NODES:
+     case MEDCoupling::ON_NODES:
 -      return "NODES";
 +      return "POINTS";
      default:
        std::cerr << "MEDPresentation::getFieldTypeString() -- Not implemented ! Gauss points?";
        return "";