Fix compilation errors

diff --git a/src/Controls/Makefile.am b/src/Controls/Makefile.am
index 51e0623e31eda72a54c6f3d6263260945d83b4e6..72be43d79f29c77c2f7eed8b3f4c2b319bf1e658 100644 (file)
--- a/src/Controls/Makefile.am
+++ b/src/Controls/Makefile.am
@@ -60,4 +60,5 @@ SMESHControls_LDADD = \
        ../SMDS/libSMDS.la \
        libSMESHControls.la \
        $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSALOMEBasics \
+       $(GEOM_LDFLAGS) -lGEOMAlgo \
        $(CAS_LDPATH) -lTKernel -lTKBRep -lTKG3d

diff --git a/src/MEFISTO2/aptrte.h b/src/MEFISTO2/aptrte.h
index cb46a2e2c398bf9a435a5bc908a3fee69a8e105e..6c5f3f9d612b34e61f49e2f51a1bd1a6213a07ac 100755 (executable)
--- a/src/MEFISTO2/aptrte.h
+++ b/src/MEFISTO2/aptrte.h
@@ -331,7 +331,7 @@ extern "C" {void
 #endif
   terefr( Z & nbarpi, R3 * mnpxyd,
                            Z & mosoar, Z & mxsoar, Z & n1soar, Z * mnsoar,
-                           Z & moartr, Z & n1artr, Z * mnartr, Z * mnarst,
+                           Z & moartr, Z & mxartr, Z & n1artr, Z * mnartr, Z * mnarst,
                            Z & mxarcf, Z * mnarc1, Z * mnarc2,
                            Z * mnarc3, Z * mnarc4,
                            Z & n, Z & ierr );
@@ -355,12 +355,12 @@ extern "C" {void
 #ifdef WIN32
               __stdcall
 #endif
-  teamqt( Z & nutysu,
+  teamqt( Z & nutysu, R & aretmx, R & airemx,
                            Z * mnarst, Z & mosoar, Z & mxsoar, Z & n1soar, Z * mnsoar,
                            Z & moartr, Z & mxartr, Z & n1artr, Z * mnartr,
                            Z & mxarcf, Z * mntrcf, Z * mnstbo,
                            Z * n1arcf, Z * mnarcf, Z * mnarc1,
-                           R3 * comxmi, Z & nbarpi, Z & nbsomm, Z & mxsomm,
+                           Z & nbarpi, Z & nbsomm, Z & mxsomm,
                            R3 * mnpxyd, Z * mnslig,
                            Z & ierr );
 }

diff --git a/src/SMESHDS/SMESHDS_Mesh.cxx b/src/SMESHDS/SMESHDS_Mesh.cxx
index 3351960a8ca6041ba7c66e27b7353e4dee2e191b..e2bf53c6e6e7073e32253575b26c38e29de484e1 100644 (file)
--- a/src/SMESHDS/SMESHDS_Mesh.cxx
+++ b/src/SMESHDS/SMESHDS_Mesh.cxx
@@ -113,7 +113,7 @@ bool SMESHDS_Mesh::AddHypothesis(const TopoDS_Shape & SS,
                                  const SMESHDS_Hypothesis * H)
 {
   list<const SMESHDS_Hypothesis *>& alist=
-    myShapeToHypothesis[SS.Oriented(TopAbs_FORWARD)]; // ignore orientation of SS
+    myShapeToHypothesis(SS.Oriented(TopAbs_FORWARD)); // ignore orientation of SS
 
   //Check if the Hypothesis is still present
   list<const SMESHDS_Hypothesis*>::iterator ith=find(alist.begin(),alist.end(), H );
@@ -132,12 +132,9 @@ bool SMESHDS_Mesh::AddHypothesis(const TopoDS_Shape & SS,
 bool SMESHDS_Mesh::RemoveHypothesis(const TopoDS_Shape &       S,
                                     const SMESHDS_Hypothesis * H)
 {
-  ShapeToHypothesis::iterator its=
-    myShapeToHypothesis.find(S.Oriented(TopAbs_FORWARD)); // ignore orientation of S
-
-  if(its!=myShapeToHypothesis.end())
+  if( myShapeToHypothesis.IsBound( S.Oriented(TopAbs_FORWARD) ) )
   {
-    list<const SMESHDS_Hypothesis *>& alist=(*its).second;
+    list<const SMESHDS_Hypothesis *>& alist=myShapeToHypothesis.ChangeFind( S.Oriented(TopAbs_FORWARD) );
     list<const SMESHDS_Hypothesis*>::iterator ith=find(alist.begin(),alist.end(), H );
     if (ith != alist.end())
     {
@@ -1024,10 +1021,8 @@ list<int> SMESHDS_Mesh::SubMeshIndices()
 const list<const SMESHDS_Hypothesis*>&
 SMESHDS_Mesh::GetHypothesis(const TopoDS_Shape & S) const
 {
-  ShapeToHypothesis::const_iterator its=
-    myShapeToHypothesis.find(S.Oriented(TopAbs_FORWARD)); // ignore orientation of S
-  if (its!=myShapeToHypothesis.end())
-    return its->second;
+  if ( myShapeToHypothesis.IsBound( S.Oriented(TopAbs_FORWARD) ) ) // ignore orientation of S
+     return myShapeToHypothesis.Find( S.Oriented(TopAbs_FORWARD) );
 
   static list<const SMESHDS_Hypothesis*> empty;
   return empty;
@@ -1068,7 +1063,7 @@ bool SMESHDS_Mesh::HasMeshElements(const TopoDS_Shape & S)
 //=======================================================================
 bool SMESHDS_Mesh::HasHypothesis(const TopoDS_Shape & S)
 {
-  return myShapeToHypothesis.find(S.Oriented(TopAbs_FORWARD))!=myShapeToHypothesis.end();
+  return myShapeToHypothesis.IsBound(S.Oriented(TopAbs_FORWARD));
 }
 
 //=======================================================================

diff --git a/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx b/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx
index 1fa802bc1a3ccbbfa1ad2e2491a180e4f5995033..696305db033de0714255727581bbcf4476219463 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx
@@ -258,13 +258,13 @@ namespace SMESH {
       //---------------------------------------
       myPointsNumDataSet->Delete();
       
-      myPtsLabeledDataMapper->RemoveAllInputs();
+      //myPtsLabeledDataMapper->RemoveAllInputs();        //vtk 5.0 porting
       myPtsLabeledDataMapper->Delete();
 
-      myPtsSelectVisiblePoints->UnRegisterAllOutputs();
+      //myPtsSelectVisiblePoints->UnRegisterAllOutputs(); //vtk 5.0 porting
       myPtsSelectVisiblePoints->Delete();
 
-      myPtsMaskPoints->UnRegisterAllOutputs();
+      //myPtsMaskPoints->UnRegisterAllOutputs();         //vtk 5.0 porting
       myPtsMaskPoints->Delete();
 
       myPointLabels->Delete();

diff --git a/src/SMESH_I/Makefile.am b/src/SMESH_I/Makefile.am
index 7b4e0550c76b8e91706ab0c3cd6210c0abcecc0e..1b1a03838421cd334c66b28e4912edb8596a028e 100644 (file)
--- a/src/SMESH_I/Makefile.am
+++ b/src/SMESH_I/Makefile.am
@@ -34,7 +34,7 @@ salomeinclude_HEADERS = \
        SMESH_Gen_i.hxx \
        SMESH_Algo_i.hxx \
        SMESH_0D_Algo_i.hxx \
-       SMESH_1D_Algo_i.hxx \   
+       SMESH_1D_Algo_i.hxx \
        SMESH_2D_Algo_i.hxx \
        SMESH_3D_Algo_i.hxx \
        SMESH_subMesh_i.hxx \

diff --git a/src/StdMeshers/Makefile.am b/src/StdMeshers/Makefile.am
index 870c426feb008078b6308de809c5ae930368bc9c..750e7d100946f5be50a2a002e0dcb955479fa5eb 100644 (file)
--- a/src/StdMeshers/Makefile.am
+++ b/src/StdMeshers/Makefile.am
@@ -61,7 +61,7 @@ salomeinclude_HEADERS = \
        StdMeshers_CompositeSegment_1D.hxx \
        StdMeshers_FaceSide.hxx \
        StdMeshers_SegmentAroundVertex_0D.hxx \
-       StdMeshers_SegmentLengthAroundVertex_0D.hxx \
+       StdMeshers_SegmentLengthAroundVertex.hxx \
        SMESH_StdMeshers.hxx
 
 # Libraries targets
@@ -102,7 +102,8 @@ dist_libStdMeshers_la_SOURCES = \
        StdMeshers_CompositeSegment_1D.cxx \
        StdMeshers_FaceSide.cxx \
        StdMeshers_SegmentAroundVertex_0D.cxx \
-       StdMeshers_SegmentLengthAroundVertex_0D.cxx
+       StdMeshers_SegmentLengthAroundVertex.cxx
+
 
 # additionnal information to compil and link file
 libStdMeshers_la_CPPFLAGS = \