ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-11-15 01:58:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation errors

Browse Source
This commit is contained in:
abd 2007-04-19 09:39:10 +00:00
parent 358f8ddd54
commit 3e125896a0
6 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Controls/Makefile.am
View File

@ -60,4 +60,5 @@ SMESHControls_LDADD = \
../SMDS/libSMDS.la \ ../SMDS/libSMDS.la \
libSMESHControls.la \ libSMESHControls.la \
$(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSALOMEBasics \ $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSALOMEBasics \
$(GEOM_LDFLAGS) -lGEOMAlgo \
$(CAS_LDPATH) -lTKernel -lTKBRep -lTKG3d $(CAS_LDPATH) -lTKernel -lTKBRep -lTKG3d

6
src/MEFISTO2/aptrte.h
View File

@ -331,7 +331,7 @@ extern "C" {void
#endif #endif
terefr( Z & nbarpi, R3 * mnpxyd, terefr( Z & nbarpi, R3 * mnpxyd,
Z & mosoar, Z & mxsoar, Z & n1soar, Z * mnsoar, 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 & mxarcf, Z * mnarc1, Z * mnarc2,
Z * mnarc3, Z * mnarc4, Z * mnarc3, Z * mnarc4,
Z & n, Z & ierr ); Z & n, Z & ierr );
@ -355,12 +355,12 @@ extern "C" {void
#ifdef WIN32 #ifdef WIN32
__stdcall __stdcall
#endif #endif
teamqt( Z & nutysu, teamqt( Z & nutysu, R & aretmx, R & airemx,
Z * mnarst, Z & mosoar, Z & mxsoar, Z & n1soar, Z * mnsoar, Z * mnarst, Z & mosoar, Z & mxsoar, Z & n1soar, Z * mnsoar,
Z & moartr, Z & mxartr, Z & n1artr, Z * mnartr, Z & moartr, Z & mxartr, Z & n1artr, Z * mnartr,
Z & mxarcf, Z * mntrcf, Z * mnstbo, Z & mxarcf, Z * mntrcf, Z * mnstbo,
Z * n1arcf, Z * mnarcf, Z * mnarc1, Z * n1arcf, Z * mnarcf, Z * mnarc1,
R3 * comxmi, Z & nbarpi, Z & nbsomm, Z & mxsomm, Z & nbarpi, Z & nbsomm, Z & mxsomm,
R3 * mnpxyd, Z * mnslig, R3 * mnpxyd, Z * mnslig,
Z & ierr ); Z & ierr );
} }

17
src/SMESHDS/SMESHDS_Mesh.cxx
View File

@ -113,7 +113,7 @@ bool SMESHDS_Mesh::AddHypothesis(const TopoDS_Shape & SS,
const SMESHDS_Hypothesis * H) const SMESHDS_Hypothesis * H)
{ {
list<const SMESHDS_Hypothesis *>& alist= 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 //Check if the Hypothesis is still present
list<const SMESHDS_Hypothesis*>::iterator ith=find(alist.begin(),alist.end(), H ); 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, bool SMESHDS_Mesh::RemoveHypothesis(const TopoDS_Shape & S,
const SMESHDS_Hypothesis * H) const SMESHDS_Hypothesis * H)
{ {
ShapeToHypothesis::iterator its= if( myShapeToHypothesis.IsBound( S.Oriented(TopAbs_FORWARD) ) )
myShapeToHypothesis.find(S.Oriented(TopAbs_FORWARD)); // ignore orientation of S
if(its!=myShapeToHypothesis.end())
{ {
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 ); list<const SMESHDS_Hypothesis*>::iterator ith=find(alist.begin(),alist.end(), H );
if (ith != alist.end()) if (ith != alist.end())
{ {
@ -1024,10 +1021,8 @@ list<int> SMESHDS_Mesh::SubMeshIndices()
const list<const SMESHDS_Hypothesis*>& const list<const SMESHDS_Hypothesis*>&
SMESHDS_Mesh::GetHypothesis(const TopoDS_Shape & S) const SMESHDS_Mesh::GetHypothesis(const TopoDS_Shape & S) const
{ {
ShapeToHypothesis::const_iterator its= if ( myShapeToHypothesis.IsBound( S.Oriented(TopAbs_FORWARD) ) ) // ignore orientation of S
myShapeToHypothesis.find(S.Oriented(TopAbs_FORWARD)); // ignore orientation of S return myShapeToHypothesis.Find( S.Oriented(TopAbs_FORWARD) );
if (its!=myShapeToHypothesis.end())
return its->second;
static list<const SMESHDS_Hypothesis*> empty; static list<const SMESHDS_Hypothesis*> empty;
return empty; return empty;
@ -1068,7 +1063,7 @@ bool SMESHDS_Mesh::HasMeshElements(const TopoDS_Shape & S)
//======================================================================= //=======================================================================
bool SMESHDS_Mesh::HasHypothesis(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));
} }
//======================================================================= //=======================================================================

6
src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx
View File

@ -258,13 +258,13 @@ namespace SMESH {
//--------------------------------------- //---------------------------------------
myPointsNumDataSet->Delete(); myPointsNumDataSet->Delete();
myPtsLabeledDataMapper->RemoveAllInputs(); //myPtsLabeledDataMapper->RemoveAllInputs(); //vtk 5.0 porting
myPtsLabeledDataMapper->Delete(); myPtsLabeledDataMapper->Delete();
myPtsSelectVisiblePoints->UnRegisterAllOutputs(); //myPtsSelectVisiblePoints->UnRegisterAllOutputs(); //vtk 5.0 porting
myPtsSelectVisiblePoints->Delete(); myPtsSelectVisiblePoints->Delete();
myPtsMaskPoints->UnRegisterAllOutputs(); //myPtsMaskPoints->UnRegisterAllOutputs(); //vtk 5.0 porting
myPtsMaskPoints->Delete(); myPtsMaskPoints->Delete();
myPointLabels->Delete(); myPointLabels->Delete();

5
src/StdMeshers/Makefile.am
View File

@ -61,7 +61,7 @@ salomeinclude_HEADERS = \
StdMeshers_CompositeSegment_1D.hxx \ StdMeshers_CompositeSegment_1D.hxx \
StdMeshers_FaceSide.hxx \ StdMeshers_FaceSide.hxx \
StdMeshers_SegmentAroundVertex_0D.hxx \ StdMeshers_SegmentAroundVertex_0D.hxx \
StdMeshers_SegmentLengthAroundVertex_0D.hxx \ StdMeshers_SegmentLengthAroundVertex.hxx \
SMESH_StdMeshers.hxx SMESH_StdMeshers.hxx
# Libraries targets # Libraries targets
@ -102,7 +102,8 @@ dist_libStdMeshers_la_SOURCES = \
StdMeshers_CompositeSegment_1D.cxx \ StdMeshers_CompositeSegment_1D.cxx \
StdMeshers_FaceSide.cxx \ StdMeshers_FaceSide.cxx \
StdMeshers_SegmentAroundVertex_0D.cxx \ StdMeshers_SegmentAroundVertex_0D.cxx \
StdMeshers_SegmentLengthAroundVertex_0D.cxx StdMeshers_SegmentLengthAroundVertex.cxx
# additionnal information to compil and link file # additionnal information to compil and link file
libStdMeshers_la_CPPFLAGS = \ libStdMeshers_la_CPPFLAGS = \