From 44500f3b5847d010c4d42cad1f7e4ddf1452d519 Mon Sep 17 00:00:00 2001 From: rnv Date: Thu, 11 Oct 2007 06:46:19 +0000 Subject: [PATCH] Fix problem with size of med_int on 64-bits platform. --- src/CONVERTOR/Makefile.am | 4 +++- src/CONVERTOR/VISU_MedConvertor.cxx | 9 +++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/CONVERTOR/Makefile.am b/src/CONVERTOR/Makefile.am index 3176453e..a8df0bb0 100644 --- a/src/CONVERTOR/Makefile.am +++ b/src/CONVERTOR/Makefile.am @@ -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) \ diff --git a/src/CONVERTOR/VISU_MedConvertor.cxx b/src/CONVERTOR/VISU_MedConvertor.cxx index 62166ee3..fc4b9379 100644 --- a/src/CONVERTOR/VISU_MedConvertor.cxx +++ b/src/CONVERTOR/VISU_MedConvertor.cxx @@ -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]; -- 2.39.2