X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_MaxElementVolume.cxx;h=86c4f2aa4e5dbe2fa40f7c306e2c1f7683c3cb1c;hb=264eeb2edd6977ccf2d2bd88cbb210353f63f7c9;hp=0f24ceabfff81344b79c9268a357cf49cb07e151;hpb=bd8f1aee7c78f7d2eb82bd4fec5e08c9e3d280ce;p=modules%2Fsmesh.git diff --git a/src/StdMeshers/StdMeshers_MaxElementVolume.cxx b/src/StdMeshers/StdMeshers_MaxElementVolume.cxx index 0f24ceabf..86c4f2aa4 100644 --- a/src/StdMeshers/StdMeshers_MaxElementVolume.cxx +++ b/src/StdMeshers/StdMeshers_MaxElementVolume.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2013 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 @@ -6,7 +6,7 @@ // 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 @@ -29,6 +29,7 @@ #include "StdMeshers_MaxElementVolume.hxx" #include "SMDS_MeshElement.hxx" +#include "SMESHDS_Mesh.hxx" #include "SMESHDS_SubMesh.hxx" #include "SMESH_ControlsDef.hxx" #include "SMESH_Mesh.hxx" @@ -47,8 +48,8 @@ using namespace std; */ //============================================================================= -StdMeshers_MaxElementVolume::StdMeshers_MaxElementVolume(int hypId, int studyId, SMESH_Gen* gen) - : SMESH_Hypothesis(hypId, studyId, gen) +StdMeshers_MaxElementVolume::StdMeshers_MaxElementVolume(int hypId, SMESH_Gen* gen) + : SMESH_Hypothesis(hypId, gen) { _maxVolume = 1.; _name = "MaxElementVolume"; @@ -63,7 +64,6 @@ StdMeshers_MaxElementVolume::StdMeshers_MaxElementVolume(int hypId, int studyId, StdMeshers_MaxElementVolume::~StdMeshers_MaxElementVolume() { - MESSAGE("StdMeshers_MaxElementVolume::~StdMeshers_MaxElementVolume"); } //============================================================================= @@ -116,7 +116,7 @@ istream & StdMeshers_MaxElementVolume::LoadFrom(istream & load) { bool isOK = true; double a; - isOK = (load >> a); + isOK = static_cast(load >> a); if (isOK) this->_maxVolume = a; else