From 3e125896a0a03d99b53cd4b217318fd5368ae5a5 Mon Sep 17 00:00:00 2001 From: abd Date: Thu, 19 Apr 2007 09:39:10 +0000 Subject: [PATCH] Fix compilation errors --- src/Controls/Makefile.am | 1 + src/MEFISTO2/aptrte.h | 6 +++--- src/SMESHDS/SMESHDS_Mesh.cxx | 17 ++++++----------- src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx | 6 +++--- src/SMESH_I/Makefile.am | 2 +- src/StdMeshers/Makefile.am | 5 +++-- 6 files changed, 17 insertions(+), 20 deletions(-) diff --git a/src/Controls/Makefile.am b/src/Controls/Makefile.am index 51e0623e3..72be43d79 100644 --- 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 cb46a2e2c..6c5f3f9d6 100755 --- 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 3351960a8..e2bf53c6e 100644 --- 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& 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::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& alist=(*its).second; + list& alist=myShapeToHypothesis.ChangeFind( S.Oriented(TopAbs_FORWARD) ); list::iterator ith=find(alist.begin(),alist.end(), H ); if (ith != alist.end()) { @@ -1024,10 +1021,8 @@ list SMESHDS_Mesh::SubMeshIndices() const list& 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 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 1fa802bc1..696305db0 100644 --- 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 7b4e0550c..1b1a03838 100644 --- 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 870c426fe..750e7d100 100644 --- 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 = \