Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'V8_3_0a2' into ngr/python3_dev
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_MaxElementVolume.cxx
diff --git
a/src/StdMeshers/StdMeshers_MaxElementVolume.cxx
b/src/StdMeshers/StdMeshers_MaxElementVolume.cxx
index 4ece1400800dae7c94d2ef7fe96fd9cbc2fa70e4..7cdb3e488a6b9497011a9f351c037a68e0e284e3 100644
(file)
--- a/
src/StdMeshers/StdMeshers_MaxElementVolume.cxx
+++ b/
src/StdMeshers/StdMeshers_MaxElementVolume.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-29,6
+29,7
@@
#include "StdMeshers_MaxElementVolume.hxx"
#include "SMDS_MeshElement.hxx"
#include "StdMeshers_MaxElementVolume.hxx"
#include "SMDS_MeshElement.hxx"
+#include "SMESHDS_Mesh.hxx"
#include "SMESHDS_SubMesh.hxx"
#include "SMESH_ControlsDef.hxx"
#include "SMESH_Mesh.hxx"
#include "SMESHDS_SubMesh.hxx"
#include "SMESH_ControlsDef.hxx"
#include "SMESH_Mesh.hxx"
@@
-63,7
+64,6
@@
StdMeshers_MaxElementVolume::StdMeshers_MaxElementVolume(int hypId, int studyId,
StdMeshers_MaxElementVolume::~StdMeshers_MaxElementVolume()
{
StdMeshers_MaxElementVolume::~StdMeshers_MaxElementVolume()
{
- MESSAGE("StdMeshers_MaxElementVolume::~StdMeshers_MaxElementVolume");
}
//=============================================================================
}
//=============================================================================
@@
-116,7
+116,7
@@
istream & StdMeshers_MaxElementVolume::LoadFrom(istream & load)
{
bool isOK = true;
double a;
{
bool isOK = true;
double a;
- isOK = (load >> a);
+ isOK =
static_cast<bool>
(load >> a);
if (isOK)
this->_maxVolume = a;
else
if (isOK)
this->_maxVolume = a;
else