X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_NumberOfLayers.cxx;h=67aac1d2419d6c78669708589a3edf9e4389cfe7;hp=d3e0b5277df28cda7d9bb1db6e5793a767477b23;hb=382f2cc4abb2ee8553a911aeb27348e96c39d197;hpb=251f8c052dd12dd29922210dc901b295fe999a0e diff --git a/src/StdMeshers/StdMeshers_NumberOfLayers.cxx b/src/StdMeshers/StdMeshers_NumberOfLayers.cxx index d3e0b5277..67aac1d24 100644 --- a/src/StdMeshers/StdMeshers_NumberOfLayers.cxx +++ b/src/StdMeshers/StdMeshers_NumberOfLayers.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2020 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" ); } //============================================================================= @@ -73,11 +72,10 @@ StdMeshers_NumberOfLayers::~StdMeshers_NumberOfLayers() //============================================================================= void StdMeshers_NumberOfLayers::SetNumberOfLayers(int numberOfLayers) - throw ( SALOME_Exception ) { 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 +116,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;