X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_QuadrangleParams.cxx;h=dc3e692e1ad7edc5c42cdc801a4a652e42f239f6;hb=0a237be4b91b6db526b340c534f40a385d6d65ab;hp=e8ab5ad6abec5e56575f3ed6d7ba50f6fb48dabf;hpb=f7aba4830d53719b963fdb7fccc98b760fdef2d1;p=modules%2Fsmesh.git diff --git a/src/StdMeshers/StdMeshers_QuadrangleParams.cxx b/src/StdMeshers/StdMeshers_QuadrangleParams.cxx index e8ab5ad6a..dc3e692e1 100644 --- a/src/StdMeshers/StdMeshers_QuadrangleParams.cxx +++ b/src/StdMeshers/StdMeshers_QuadrangleParams.cxx @@ -1,9 +1,9 @@ -// Copyright (C) 2007-2013 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 // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -42,9 +42,9 @@ using namespace std; * */ //============================================================================= -StdMeshers_QuadrangleParams::StdMeshers_QuadrangleParams(int hypId, int studyId, +StdMeshers_QuadrangleParams::StdMeshers_QuadrangleParams(int hypId, SMESH_Gen * gen) - : SMESH_Hypothesis(hypId, studyId, gen) + : SMESH_Hypothesis(hypId, gen) { _name = "QuadrangleParams"; _param_algo_dim = 2; @@ -153,16 +153,16 @@ ostream & StdMeshers_QuadrangleParams::SaveTo(ostream & save) istream & StdMeshers_QuadrangleParams::LoadFrom(istream & load) { bool isOK = true; - isOK = (load >> _triaVertexID); + isOK = static_cast(load >> _triaVertexID); if (!isOK) load.clear(ios::badbit | load.rdstate()); - isOK = (load >> _objEntry); + isOK = static_cast(load >> _objEntry); if (!isOK) load.clear(ios::badbit | load.rdstate()); int type; - isOK = (load >> type); + isOK = static_cast(load >> type); if (isOK) _quadType = StdMeshers_QuadType(type);