Merge branch 'spns/19079'

[modules/smesh.git] / src / MEDWrapper / MED_Common.hxx

diff --git a/src/MEDWrapper/MED_Common.hxx b/src/MEDWrapper/MED_Common.hxx
index 798585d8ed7c3c0356e54c5c5202763e7e946c16..e5c33803ef7a7cf15e7e03d32502aea65efd016f 100644 (file)
--- a/src/MEDWrapper/MED_Common.hxx
+++ b/src/MEDWrapper/MED_Common.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2021  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
@@ -31,7 +31,8 @@
 #include <set>
 #include <map>
 
-#include <hdf5.h>
+#include <med.h>
+#include <smIdType.hxx>
 
 #ifdef WIN32
 #pragma warning(disable:4099)
@@ -41,11 +42,12 @@ namespace MED
 {
   typedef enum {eFAUX, eVRAI} EBooleen;
   typedef double TFloat;
-#if defined(HAVE_F77INT64)
-  typedef long TInt;
-#else
-  typedef int TInt;
-#endif
+// #if defined(HAVE_F77INT64)
+//   typedef long TInt;
+// #else
+//   typedef int TInt;
+// #endif
+  typedef med_int TInt;
   typedef hid_t TIdt;
   typedef herr_t TErr;
 
@@ -62,7 +64,7 @@ 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,
+                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;
@@ -76,6 +78,7 @@ namespace MED
   typedef enum {eCOOR, eCONN, eNOM, eNUM, eFAM, eCOOR_IND1, eCOOR_IND2, eCOOR_IND3} ETable;
 
   typedef TVector<TInt> TIntVector;
+  typedef TVector<smIdType> TIDVector;
   typedef TVector<TFloat> TFloatVector;
   typedef TVector<std::string> TStringVector;
   typedef std::set<std::string> TStringSet;