From 19131428742f4922c4f2fed8871d05831d88ef31 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Fri, 11 Sep 2015 18:52:26 +0200
Subject: [PATCH] + fix warning in smesh headers

---
 src/3rdParty/salomesmesh/inc/SMDS_MeshInfo.hxx       | 2 +-
 src/3rdParty/salomesmesh/inc/SMESH_Gen.hxx           | 2 +-
 src/3rdParty/salomesmesh/inc/StdMeshers_FaceSide.hxx | 8 ++++----
 src/3rdParty/salomesmesh/inc/StdMeshers_Prism_3D.hxx | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/3rdParty/salomesmesh/inc/SMDS_MeshInfo.hxx b/src/3rdParty/salomesmesh/inc/SMDS_MeshInfo.hxx
index b92c857dba..8d3467fd75 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; i<myNb.size(); ++i ) if ( myNb[i] ) (*myNb[i])=0;
+{ for ( std::size_t i=0; i<myNb.size(); ++i ) if ( myNb[i] ) (*myNb[i])=0;
   myNbPolygons=myNbPolyhedrons=0;
 }
 inline int // index
diff --git a/src/3rdParty/salomesmesh/inc/SMESH_Gen.hxx b/src/3rdParty/salomesmesh/inc/SMESH_Gen.hxx
index 6857408f2e..093d0714ca 100644
--- a/src/3rdParty/salomesmesh/inc/SMESH_Gen.hxx
+++ b/src/3rdParty/salomesmesh/inc/SMESH_Gen.hxx
@@ -104,7 +104,7 @@ class SMESH_EXPORT  SMESH_Gen
     int                 _algoDim;
     bool                _isGlobalAlgo;
 
-    TAlgoStateError(): _algoDim(0),_algo(0),_name(SMESH_Hypothesis::HYP_OK) {}
+    TAlgoStateError(): _name(SMESH_Hypothesis::HYP_OK),_algo(0),_algoDim(0) {}
     void Set(TAlgoStateErrorName name, const SMESH_Algo* algo, bool isGlobal)
     { _name = name; _algo = algo; _algoDim = algo->GetDim(); _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 976986a57c..d99237868b 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<int>(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();
+  return i<0 ? TopExp::LastVertex( myEdge.back(), 1) : i<static_cast<int>(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.;
+  return i==0 ? 0. : i<static_cast<int>(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;
+  return i<static_cast<int>(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 5c29f63ecc..86fa1845ee 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; }