X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_NumberOfLayers.cxx;h=e560a6ee63fb97b872e9bc7c19c8e39627b07db8;hb=e15a3a87cc738a5e3da00b3e09e7c8e17d733dc7;hp=ad7cfbfe2decbbc2b341e10e9324818f27bfbc0f;hpb=5d68554076bbca0e1e95fb0db215a6c2b84b6c54;p=modules%2Fsmesh.git diff --git a/src/StdMeshers/StdMeshers_NumberOfLayers.cxx b/src/StdMeshers/StdMeshers_NumberOfLayers.cxx index ad7cfbfe2..e560a6ee6 100644 --- a/src/StdMeshers/StdMeshers_NumberOfLayers.cxx +++ b/src/StdMeshers/StdMeshers_NumberOfLayers.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -42,9 +42,9 @@ using namespace std; */ //============================================================================= -StdMeshers_NumberOfLayers::StdMeshers_NumberOfLayers(int hypId, int studyId, +StdMeshers_NumberOfLayers::StdMeshers_NumberOfLayers(int hypId, SMESH_Gen * gen) - : SMESH_Hypothesis(hypId, studyId, gen) + : SMESH_Hypothesis(hypId, gen) { _name = "NumberOfLayers"; // used by RadialPrism_3D _param_algo_dim = 3; // 3D @@ -61,7 +61,6 @@ StdMeshers_NumberOfLayers::StdMeshers_NumberOfLayers(int hypId, int studyId, StdMeshers_NumberOfLayers::~StdMeshers_NumberOfLayers() { - MESSAGE( "StdMeshers_NumberOfLayers::~StdMeshers_NumberOfLayers" ); } //============================================================================= @@ -77,7 +76,7 @@ void StdMeshers_NumberOfLayers::SetNumberOfLayers(int numberOfLayers) { if ( _nbLayers != numberOfLayers ) { if ( numberOfLayers <= 0 ) - throw SALOME_Exception(LOCALIZED("numberOfLayers must be positive")); + throw SALOME_Exception(LOCALIZED("numberOfLayers must be more than zero")); _nbLayers = numberOfLayers; NotifySubMeshesHypothesisModification(); @@ -118,7 +117,7 @@ ostream & StdMeshers_NumberOfLayers::SaveTo(ostream & save) istream & StdMeshers_NumberOfLayers::LoadFrom(istream & load) { bool isOK = true; - isOK = (load >> _nbLayers); + isOK = static_cast(load >> _nbLayers); if (!isOK) load.clear(ios::badbit | load.rdstate()); return load;