From 646a140e478e1aeb869851c5feff1eca58940170 Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 17 Jun 2011 10:44:02 +0000 Subject: [PATCH] Remove dependency of SMDS on CASCADE --- src/SMDS/Makefile.am | 7 +------ src/SMDS/SMDS_MeshElementIDFactory.cxx | 6 ++++-- src/SMDS/SMDS_MeshNode.hxx | 1 - 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/SMDS/Makefile.am b/src/SMDS/Makefile.am index 34e8f9c01..c5fe45fdc 100644 --- a/src/SMDS/Makefile.am +++ b/src/SMDS/Makefile.am @@ -122,21 +122,16 @@ dist_libSMDS_la_SOURCES = \ # additionnal information to compil and link file libSMDS_la_CPPFLAGS = \ $(KERNEL_CXXFLAGS) \ - $(CAS_CPPFLAGS) \ $(VTK_INCLUDES) \ $(BOOST_CPPFLAGS) libSMDS_la_LDFLAGS = \ $(VTK_LIBS) \ - $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ - $(CAS_KERNEL) + $(KERNEL_LDFLAGS) -lSALOMELocalTrace # Executables targets bin_PROGRAMS = SMDS_MemoryLimit dist_SMDS_MemoryLimit_SOURCES = \ SMDS_MemoryLimit.cxx -SMDS_MemoryLimit_LDADD = \ - $(KERNEL_LDFLAGS) -lSALOMELocalTrace - #libSMDS_la_LDFLAGS += -L/data/eap/S5_MV/INSTALL/SMESH/lib/salome -lPerfmeter diff --git a/src/SMDS/SMDS_MeshElementIDFactory.cxx b/src/SMDS/SMDS_MeshElementIDFactory.cxx index 7a656c195..6c86e6f28 100644 --- a/src/SMDS/SMDS_MeshElementIDFactory.cxx +++ b/src/SMDS/SMDS_MeshElementIDFactory.cxx @@ -38,6 +38,8 @@ #include "SMDS_UnstructuredGrid.hxx" #include +#include + using namespace std; //======================================================================= @@ -173,7 +175,7 @@ void SMDS_MeshElementIDFactory::ReleaseID(int ID, int vtkId) void SMDS_MeshElementIDFactory::updateMinMax() const { - myMin = IntegerLast(); + myMin = INT_MAX; myMax = 0; for (int i = 0; i < myMesh->myCells.size(); i++) { @@ -186,7 +188,7 @@ void SMDS_MeshElementIDFactory::updateMinMax() const myMin = id; } } - if (myMin == IntegerLast()) + if (myMin == INT_MAX) myMin = 0; } diff --git a/src/SMDS/SMDS_MeshNode.hxx b/src/SMDS/SMDS_MeshNode.hxx index 560fef0df..107402393 100644 --- a/src/SMDS/SMDS_MeshNode.hxx +++ b/src/SMDS/SMDS_MeshNode.hxx @@ -32,7 +32,6 @@ #include "SMDS_MeshElement.hxx" #include "SMDS_Position.hxx" #include "ObjectPool.hxx" -#include class SMDS_EXPORT SMDS_MeshNode:public SMDS_MeshElement { -- 2.39.2