X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_FixedPoints1D.cxx;h=83e19296b14883526b2f8e1a45b81c4cce092a75;hb=8ae46824610592a518edf794fd90eff15ed68739;hp=a731f9b2a211a15205b7df465b8224dffa909cd3;hpb=b0a908c0d20341651771d0249fb10882f54b2aad;p=modules%2Fsmesh.git diff --git a/src/StdMeshers/StdMeshers_FixedPoints1D.cxx b/src/StdMeshers/StdMeshers_FixedPoints1D.cxx index a731f9b2a..83e19296b 100644 --- a/src/StdMeshers/StdMeshers_FixedPoints1D.cxx +++ b/src/StdMeshers/StdMeshers_FixedPoints1D.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2015 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 @@ -150,37 +150,37 @@ istream & StdMeshers_FixedPoints1D::LoadFrom(istream & load) int intVal; double dblVal; - isOK = (load >> intVal); + isOK = static_cast(load >> intVal); if (isOK && intVal > 0) { _params.clear(); _params.reserve( intVal ); - for (int i = 0; i < _params.capacity() && isOK; i++) { - isOK = (load >> dblVal); + for ( size_t i = 0; i < _params.capacity() && isOK; i++) { + isOK = static_cast(load >> dblVal); if ( isOK ) _params.push_back( dblVal ); } } - isOK = (load >> intVal); + isOK = static_cast(load >> intVal); if (isOK && intVal > 0) { _nbsegs.clear(); _nbsegs.reserve( intVal ); - for (int i = 0; i < _nbsegs.capacity() && isOK; i++) { - isOK = (load >> intVal); + for ( size_t i = 0; i < _nbsegs.capacity() && isOK; i++) { + isOK = static_cast(load >> intVal); if ( isOK ) _nbsegs.push_back( intVal ); } } - isOK = (load >> intVal); + isOK = static_cast(load >> intVal); if (isOK && intVal > 0) { _edgeIDs.clear(); _edgeIDs.reserve( intVal ); - for (int i = 0; i < _edgeIDs.capacity() && isOK; i++) { - isOK = (load >> intVal); + for ( size_t i = 0; i < _edgeIDs.capacity() && isOK; i++) { + isOK = static_cast(load >> intVal); if ( isOK ) _edgeIDs.push_back( intVal ); } } - isOK = (load >> _objEntry); + isOK = static_cast(load >> _objEntry); return load; }