X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FMEDWrapper%2FBase%2FMED_Common.hxx;h=623cc0e3f70362f71e1a7925d395931b9e0a73ed;hb=98e8c177214dcc9d7b48f00048f165526aeca06e;hp=4715f6c85ae96dc873602cab22cf7948052c7733;hpb=7ec258416f5fd16634ee4ab7c789f9af809dee18;p=modules%2Fsmesh.git

diff --git a/src/MEDWrapper/Base/MED_Common.hxx b/src/MEDWrapper/Base/MED_Common.hxx
index 4715f6c85..623cc0e3f 100644
--- a/src/MEDWrapper/Base/MED_Common.hxx
+++ b/src/MEDWrapper/Base/MED_Common.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  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
@@ -6,7 +6,7 @@
 // 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.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -44,8 +44,10 @@
 #endif
 
 namespace MED{
-
-  enum EVersion {eVUnknown = -1, eV2_1, eV2_2};
+  // enum EVersion should be synchronized with enum MED_VERSION in SMESH_Mesh.idl (.hh)
+  // i.e. same positive values!
+  enum EVersion {eVUnknown = -1, eV2_1, eV2_2, eLATEST,
+                 eMINOR_0, eMINOR_1, eMINOR_2, eMINOR_3, eMINOR_4, eMINOR_5, eMINOR_6, eMINOR_7, eMINOR_8, eMINOR_9};
   
   typedef enum {eFAUX, eVRAI} EBooleen ; 
   typedef double TFloat;
@@ -59,7 +61,7 @@ namespace MED{
 
   typedef enum {eFULL_INTERLACE, eNO_INTERLACE} EModeSwitch;
 
-  typedef enum {eFLOAT64=6, eINT=26} ETypeChamp;
+  typedef enum {eFLOAT64=6, eINT=24, eLONG=26 } ETypeChamp;
 
   typedef enum {eNON_STRUCTURE, eSTRUCTURE} EMaillage;
 
@@ -70,8 +72,8 @@ namespace MED{
   typedef enum {ePOINT1=1, eSEG2=102, eSEG3=103, eTRIA3=203,
                 eQUAD4=204, eTRIA6=206, eTRIA7=207, eQUAD8=208, eQUAD9=209,eTETRA4=304,
                 ePYRA5=305, ePENTA6=306, eHEXA8=308, eOCTA12=312, eTETRA10=310, 
-                ePYRA13=313, ePENTA15=315, eHEXA20=320, eHEXA27=327,
-                ePOLYGONE=400, ePOLYEDRE=500, eNONE=0, 
+                ePYRA13=313, ePENTA15=315, ePENTA18=318, eHEXA20=320, eHEXA27=327,
+                ePOLYGONE=400, ePOLYGON2=420, ePOLYEDRE=500, eNONE=0, 
                 eBALL=1101 /*no such a type in med.h, it's just a trick*/,
                 eAllGeoType=-1 } EGeometrieElement;