From: vsr Date: Thu, 11 Nov 2010 13:05:42 +0000 (+0000) Subject: 0021063: [CEA 434] Compilation using gnu compiler v4.5 X-Git-Tag: V6_2_0a1~6 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=be001649f716af02c2252323a15ef342ed71b98b;p=plugins%2Fnetgenplugin.git 0021063: [CEA 434] Compilation using gnu compiler v4.5 --- diff --git a/adm_local/unix/config_files/check_NETGEN.m4 b/adm_local/unix/config_files/check_NETGEN.m4 index b7f3975..df9f542 100644 --- a/adm_local/unix/config_files/check_NETGEN.m4 +++ b/adm_local/unix/config_files/check_NETGEN.m4 @@ -107,7 +107,7 @@ if test "x$NETGEN_HOME" != "x"; then AC_MSG_CHECKING(for Netgen libraries) LDFLAGS_old="$LDFLAGS" - LDFLAGS="-L. -lNETGEN $CAS_LDPATH -lTKBRep -lTKShHealing -lTKSTEP -lTKXSBase -lTKIGES -lTKSTL -lTKTopAlgo $LDFLAGS" + LDFLAGS="-L. -lNETGEN $CAS_LDPATH -lTKernel -lTKMath -lTKG3d -lTKBRep -lTKShHealing -lTKSTEP -lTKXSBase -lTKIGES -lTKSTL -lTKTopAlgo $LDFLAGS" AC_TRY_COMPILE(#include #include @@ -154,7 +154,7 @@ namespace nglib { else LDFLAGS_old="$LDFLAGS" - LDFLAGS="-L${NETGEN_LIBS_DIR} -lnglib $CAS_LDPATH -lTKBRep -lTKShHealing -lTKSTEP -lTKXSBase -lTKIGES -lTKSTL -lTKTopAlgo $LDFLAGS" + LDFLAGS="-L${NETGEN_LIBS_DIR} -lnglib $CAS_LDPATH -lTKernel -lTKMath -lTKG3d -lTKBRep -lTKShHealing -lTKSTEP -lTKXSBase -lTKIGES -lTKSTL -lTKTopAlgo $LDFLAGS" AC_MSG_CHECKING(for official Netgen libraries) AC_CACHE_VAL(salome_cv_netgen_lib,[ diff --git a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx index 76093a6..9e19aff 100644 --- a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx +++ b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx @@ -291,7 +291,7 @@ void NETGENPlugin_Mesher::PrepareOCCgeometry(netgen::OCCGeometry& occgeo, #if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100 OCC_CATCH_SIGNALS; #endif - BRepMesh_IncrementalMesh::BRepMesh_IncrementalMesh (shape, 0.01, true); + BRepMesh_IncrementalMesh e(shape, 0.01, true); } catch (Standard_Failure) { } Bnd_Box bb;