Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bos #20256: [CEA 18523] Porting SMESH to int 64 bits
[modules/smesh.git]
/
src
/
MEDWrapper
/
MED_Common.hxx
diff --git
a/src/MEDWrapper/MED_Common.hxx
b/src/MEDWrapper/MED_Common.hxx
index 6a861eb5ccce7042a892defcd198ba2b87d97e0a..e5c33803ef7a7cf15e7e03d32502aea65efd016f 100644
(file)
--- a/
src/MEDWrapper/MED_Common.hxx
+++ b/
src/MEDWrapper/MED_Common.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
21
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
@@
-31,7
+31,8
@@
#include <set>
#include <map>
#include <set>
#include <map>
-#include <hdf5.h>
+#include <med.h>
+#include <smIdType.hxx>
#ifdef WIN32
#pragma warning(disable:4099)
#ifdef WIN32
#pragma warning(disable:4099)
@@
-41,11
+42,12
@@
namespace MED
{
typedef enum {eFAUX, eVRAI} EBooleen;
typedef double TFloat;
{
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;
typedef hid_t TIdt;
typedef herr_t TErr;
@@
-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 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;
typedef TVector<TFloat> TFloatVector;
typedef TVector<std::string> TStringVector;
typedef std::set<std::string> TStringSet;