X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_MaxLength.cxx;h=7b0d7fbb6cae218dddf16434464583a46b5f936a;hb=264eeb2edd6977ccf2d2bd88cbb210353f63f7c9;hp=0e7e9f6171c4eaa3c2a76afe27d8b0af58a0adc3;hpb=251f8c052dd12dd29922210dc901b295fe999a0e;p=modules%2Fsmesh.git diff --git a/src/StdMeshers/StdMeshers_MaxLength.cxx b/src/StdMeshers/StdMeshers_MaxLength.cxx index 0e7e9f617..7b0d7fbb6 100644 --- a/src/StdMeshers/StdMeshers_MaxLength.cxx +++ b/src/StdMeshers/StdMeshers_MaxLength.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -47,8 +47,8 @@ using namespace std; */ //============================================================================= -StdMeshers_MaxLength::StdMeshers_MaxLength(int hypId, int studyId, SMESH_Gen * gen) - :SMESH_Hypothesis(hypId, studyId, gen) +StdMeshers_MaxLength::StdMeshers_MaxLength(int hypId, SMESH_Gen * gen) + :SMESH_Hypothesis(hypId, gen) { _length = 1.; _preestimated = 0.; @@ -158,20 +158,20 @@ istream & StdMeshers_MaxLength::LoadFrom(istream & load) bool isOK = true; double a; - isOK = (load >> a); + isOK = static_cast(load >> a); if (isOK) _length = a; else load.clear(ios::badbit | load.rdstate()); - isOK = (load >> a); + isOK = static_cast(load >> a); if (isOK) _preestimated = a; else load.clear(ios::badbit | load.rdstate()); bool pre; - isOK = (load >> pre); + isOK = static_cast(load >> pre); if ( isOK ) _preestimation = pre; else @@ -213,7 +213,7 @@ bool StdMeshers_MaxLength::SetParametersByMesh(const SMESH_Mesh* theMesh, SMESHDS_Mesh* aMeshDS = const_cast< SMESH_Mesh* >( theMesh )->GetMeshDS(); if ( SMESH_Algo::GetNodeParamOnEdge( aMeshDS, edge, params )) { - for ( int i = 1; i < params.size(); ++i ) + for ( size_t i = 1; i < params.size(); ++i ) _length += GCPnts_AbscissaPoint::Length( AdaptCurve, params[ i-1 ], params[ i ]); nbEdges += params.size() - 1; }