]> SALOME platform Git repositories - modules/visu.git/commitdiff
Salome HOME
Fix problem with size of med_int on 64-bits platform.
authorrnv <rnv@opencascade.com>
Thu, 11 Oct 2007 06:46:19 +0000 (06:46 +0000)
committerrnv <rnv@opencascade.com>
Thu, 11 Oct 2007 06:46:19 +0000 (06:46 +0000)
src/CONVERTOR/Makefile.am
src/CONVERTOR/VISU_MedConvertor.cxx

index 3176453e4f4c5ed1702528326036910de7984ac0..a8df0bb0f380ec7297ae576bea40712768f6d51e 100644 (file)
@@ -77,7 +77,9 @@ libVisuConvertor_la_CPPFLAGS= \
        @MED_CXXFLAGS@ \
        @GUI_CXXFLAGS@ \
        $(BOOST_CPPFLAGS) \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/salome_adm/unix \
+       $(MED_CPPFLAGS)
+
 
 libVisuConvertor_la_LDFLAGS= \
        $(VTK_LIBS) \
index 62166ee34c600f9d6b1e2e5d195a19ce7e1d1f96..fc4b9379a431df3b223e9e799a68ba189c4e5099 100644 (file)
@@ -69,6 +69,8 @@ static int MY_GROUP_DEBUG = 0;
 #define _LOAD_FAMILIES_
 #define _EDF_NODE_IDS_
 
+
+
 namespace
 {
   //---------------------------------------------------------------
@@ -787,11 +789,10 @@ namespace
       VISU::TEntity aVEntity = MEDEntityToVTK(aMEntity);
       vtkIdType aDataType = VTK_DOUBLE;
       if(aFieldInfo->GetType() != MED::eFLOAT64){
-#if defined(SUN4SOL2) || defined(PCLINUX) || defined(PPRO_NT) || defined(PCLINUX64_32) || defined(OSF1_32) || defined(IRIX64_32) || defined(RS6000) || defined(HP9000)
-       aDataType = VTK_INT;
-#endif
-#if defined(IRIX64) || defined(OSF1) || defined(PCLINUX64)
+#if defined(HAVE_F77INT64)
        aDataType = VTK_LONG;
+#else  
+       aDataType = VTK_INT;
 #endif
       }
       VISU::PMEDMeshOnEntity aMeshOnEntity = theMesh->myMeshOnEntityMap[aVEntity];