Merge from BR_new_bop 15/01/2013

diff --git a/src/SMESH/Makefile.am b/src/SMESH/Makefile.am
index 72cc31ce1895d328def29aaf40b7cecc1e2c5f4b..23c4a01faed308373d609fc16021473b1c7d018c 100644 (file)
--- a/src/SMESH/Makefile.am
+++ b/src/SMESH/Makefile.am
@@ -95,5 +95,4 @@ libSMESHimpl_la_LDFLAGS = \
        $(DriverCGNS_LIB) \
        ../SMESHUtils/libSMESHUtils.la \
        $(BOOST_LIB_THREAD)  \
-       $(GEOM_LDFLAGS) -lNMTTools \
        $(CAS_LDPATH) -lTKShHealing -lTKPrim -lTKG2d -lTKCDF

diff --git a/src/SMESHClient/Makefile.am b/src/SMESHClient/Makefile.am
index e75d9e4d7bf6756fa941b3725b2e800a28e35dbc..fd6985cd9950659465d9305510d5d2e911e37043 100644 (file)
--- a/src/SMESHClient/Makefile.am
+++ b/src/SMESHClient/Makefile.am
@@ -69,7 +69,7 @@ libSMESHClient_la_LDFLAGS  = \
        ../Controls/libSMESHControls.la \
        $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeNS -lOpUtil -lSALOMEBasics \
        -lSalomeIDLKernel -lSALOMELocalTrace \
-       $(GEOM_LDFLAGS) -lNMTDS -lSalomeIDLGEOM \
+       $(GEOM_LDFLAGS) -lSalomeIDLGEOM \
        $(MED_LDFLAGS) -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 -lSalomeIDLMED -lMEDWrapper \
        $(CAS_KERNEL)
 

diff --git a/src/StdMeshers/StdMeshers_RadialPrism_3D.cxx b/src/StdMeshers/StdMeshers_RadialPrism_3D.cxx
index 6ae4ac7873760e900178b83489e59f021251ef4c..c7f8cfe806f9642e57f1b99b491e664d75d25bc6 100644 (file)
--- a/src/StdMeshers/StdMeshers_RadialPrism_3D.cxx
+++ b/src/StdMeshers/StdMeshers_RadialPrism_3D.cxx
@@ -45,7 +45,7 @@
 
 #include <BRepAdaptor_Curve.hxx>
 #include <BRepBuilderAPI_MakeEdge.hxx>
-#include <BRepTools.hxx>
+#include <BRepClass3d.hxx>
 #include <BRep_Tool.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
@@ -162,7 +162,7 @@ bool StdMeshers_RadialPrism_3D::Compute(SMESH_Mesh& aMesh, const TopoDS_Shape& a
 
   // get 2 shells
   TopoDS_Solid solid = TopoDS::Solid( aShape );
-  TopoDS_Shell outerShell = BRepTools::OuterShell( solid );
+  TopoDS_Shell outerShell = BRepClass3d::OuterShell( solid );
   TopoDS_Shape innerShell;
   int nbShells = 0;
   for ( TopoDS_Iterator It (solid); It.More(); It.Next(), ++nbShells )
@@ -402,7 +402,7 @@ bool StdMeshers_RadialPrism_3D::Evaluate(SMESH_Mesh& aMesh,
 {
   // get 2 shells
   TopoDS_Solid solid = TopoDS::Solid( aShape );
-  TopoDS_Shell outerShell = BRepTools::OuterShell( solid );
+  TopoDS_Shell outerShell = BRepClass3d::OuterShell( solid );
   TopoDS_Shape innerShell;
   int nbShells = 0;
   for ( TopoDS_Iterator It (solid); It.More(); It.Next(), ++nbShells )