Merge from V6_3_BR 06/06/2011

[modules/smesh.git] / src / SMESH_I / SMESH_MEDSupport_i.cxx

diff --git a/src/SMESH_I/SMESH_MEDSupport_i.cxx b/src/SMESH_I/SMESH_MEDSupport_i.cxx
index fd116b2910e692dad2b98b97c6583928f127d5b6..5e11b0af4fdf686eae09c7d895b31f45967a9650 100644 (file)
--- a/src/SMESH_I/SMESH_MEDSupport_i.cxx
+++ b/src/SMESH_I/SMESH_MEDSupport_i.cxx
@@ -1,23 +1,23 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
 //
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 //  SMESH SMESH_I : idl implementation based on 'SMESH' unit's calsses
@@ -79,7 +79,7 @@ SMESH_MEDSupport_i::SMESH_MEDSupport_i(SMESH_subMesh_i * sm, string name,
         {
                 _numberOfGeometricType = 1;
                 _geometricType = new SALOME_MED::medGeometryElement[1];
-                _geometricType[0] = SALOME_MED::MEDMEM_NONE;
+                _geometricType[0] = SALOME_MED::MED_NONE;
         }
         else
         {
@@ -202,7 +202,7 @@ CORBA::Boolean SMESH_MEDSupport_i::isOnAllElements()throw(SALOME::
                         SALOME::INTERNAL_ERROR);
         if (_seqNumber == false)
         {
-                if (_entity != SALOME_MED::MEDMEM_NONE)
+                if (_entity != SALOME_MED::MED_NONE)
                 {
                         _seqLength = _subMeshDS->NbNodes();
                         _seqNumber = true;
@@ -305,7 +305,7 @@ SALOME_TYPES::ListOfLong * SMESH_MEDSupport_i::getNumber(
                         SALOME::INTERNAL_ERROR);
 
         // A changer s'il ne s agit plus seulement de famille de noeuds
-        if (geomElement != SALOME_MED::MEDMEM_NONE)
+        if (geomElement != SALOME_MED::MED_NONE)
                 THROW_SALOME_CORBA_EXCEPTION("Not implemented", SALOME::BAD_PARAM);
 
         SALOME_TYPES::ListOfLong_var myseq = new SALOME_TYPES::ListOfLong;