Remove dependency of SMDS on CASCADE

diff --git a/src/SMDS/Makefile.am b/src/SMDS/Makefile.am
index 34e8f9c01db8fb441670a1406304ea7bae061c8e..c5fe45fdc30f01a8b956dc5313ecb0b254510535 100644 (file)
--- 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 7a656c195871464b8a31de2697b44b6c14a41f78..6c86e6f28b5137f7bb650ea52f7b5a06ae65a0e4 100644 (file)
--- a/src/SMDS/SMDS_MeshElementIDFactory.cxx
+++ b/src/SMDS/SMDS_MeshElementIDFactory.cxx
@@ -38,6 +38,8 @@
 #include "SMDS_UnstructuredGrid.hxx"
 #include <vtkCellType.h>
 
+#include <climits>
+
 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 560fef0df3ea233ca28456a7f8409f96ad7cad01..107402393561529ef0c310d063ae8e69224ab547 100644 (file)
--- 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 <NCollection_List.hxx>
 
 class SMDS_EXPORT SMDS_MeshNode:public SMDS_MeshElement
 {