diff --git a/src/3rdParty/salomesmesh/inc/SMDS_MeshInfo.hxx b/src/3rdParty/salomesmesh/inc/SMDS_MeshInfo.hxx index b92c857db..8d3467fd7 100644 --- a/src/3rdParty/salomesmesh/inc/SMDS_MeshInfo.hxx +++ b/src/3rdParty/salomesmesh/inc/SMDS_MeshInfo.hxx @@ -149,7 +149,7 @@ inline SMDS_MeshInfo::SMDS_MeshInfo(): } inline void // Clear SMDS_MeshInfo::Clear() -{ for ( int i=0; iGetDim(); _isGlobalAlgo = isGlobal; } void Set(TAlgoStateErrorName name, const int algoDim, bool isGlobal) diff --git a/src/3rdParty/salomesmesh/inc/StdMeshers_FaceSide.hxx b/src/3rdParty/salomesmesh/inc/StdMeshers_FaceSide.hxx index 976986a57..d99237868 100644 --- a/src/3rdParty/salomesmesh/inc/StdMeshers_FaceSide.hxx +++ b/src/3rdParty/salomesmesh/inc/StdMeshers_FaceSide.hxx @@ -245,7 +245,7 @@ inline double StdMeshers_FaceSide::Parameter(double U, TopoDS_Edge & edge) const inline TopoDS_Vertex StdMeshers_FaceSide::FirstVertex(int i) const { - return i < myEdge.size() ? TopExp::FirstVertex( myEdge[i], 1 ) : TopoDS_Vertex(); + return i < static_cast(myEdge.size()) ? TopExp::FirstVertex( myEdge[i], 1 ) : TopoDS_Vertex(); } //================================================================================ @@ -256,7 +256,7 @@ inline TopoDS_Vertex StdMeshers_FaceSide::FirstVertex(int i) const inline TopoDS_Vertex StdMeshers_FaceSide::LastVertex(int i) const { - return i<0 ? TopExp::LastVertex( myEdge.back(), 1) : i(myEdge.size()) ? TopExp::LastVertex( myEdge[i], 1 ) : TopoDS_Vertex(); } //================================================================================ @@ -267,7 +267,7 @@ inline TopoDS_Vertex StdMeshers_FaceSide::LastVertex(int i) const inline double StdMeshers_FaceSide::FirstParameter(int i) const { - return i==0 ? 0. : i(myNormPar.size()) ? myNormPar[i-1] : 1.; } //================================================================================ @@ -278,7 +278,7 @@ inline double StdMeshers_FaceSide::FirstParameter(int i) const inline double StdMeshers_FaceSide::LastParameter(int i) const { - return i(myNormPar.size()) ? myNormPar[i] : 1; } #endif diff --git a/src/3rdParty/salomesmesh/inc/StdMeshers_Prism_3D.hxx b/src/3rdParty/salomesmesh/inc/StdMeshers_Prism_3D.hxx index 5c29f63ec..86fa1845e 100644 --- a/src/3rdParty/salomesmesh/inc/StdMeshers_Prism_3D.hxx +++ b/src/3rdParty/salomesmesh/inc/StdMeshers_Prism_3D.hxx @@ -332,7 +332,7 @@ private: TPCurveOnHorFaceAdaptor( const TSideFace* sideFace, const bool isTop, const TopoDS_Face& horFace) - : mySide(sideFace), myFace(horFace), myZ(isTop ? mySide->ColumnHeight() - 1 : 0 ) {} + : mySide(sideFace), myZ(isTop ? mySide->ColumnHeight() - 1 : 0 ), myFace(horFace) {} gp_Pnt2d Value(const Standard_Real U) const; Standard_Real FirstParameter() const { return 0; } Standard_Real LastParameter() const { return 1; }