X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FMEDWrapper%2FMED_Common.hxx;h=69fa7f3d9d2293034f9846db41e3225e3051b0d0;hp=798585d8ed7c3c0356e54c5c5202763e7e946c16;hb=a274ade365bd0f0e19d56c577acc4a13aa1972a7;hpb=d3e1cabf77f67408ac401e2d387e721605cb3b10 diff --git a/src/MEDWrapper/MED_Common.hxx b/src/MEDWrapper/MED_Common.hxx index 798585d8e..69fa7f3d9 100644 --- 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,7 @@ #include #include -#include +#include #ifdef WIN32 #pragma warning(disable:4099) @@ -41,11 +41,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 +63,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;