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 remote branch 'origin/V8_5_asterstudy'
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_StartEndLength.cxx
diff --git
a/src/StdMeshers/StdMeshers_StartEndLength.cxx
b/src/StdMeshers/StdMeshers_StartEndLength.cxx
index 7f0e4659294dff3cc151b3d0f0dc43be341da055..a2bf0f7e116cf39607ee72234659af1c60773e4d 100644
(file)
--- a/
src/StdMeshers/StdMeshers_StartEndLength.cxx
+++ b/
src/StdMeshers/StdMeshers_StartEndLength.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
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
@@
-20,7
+20,7
@@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-// SMESH StdMeshers_StartEndLength : implementaion of SMESH idl descriptions
+// SMESH StdMeshers_StartEndLength : implementa
t
ion of SMESH idl descriptions
// File : StdMeshers_StartEndLength.cxx
// Module : SMESH
//
// File : StdMeshers_StartEndLength.cxx
// Module : SMESH
//
@@
-48,9
+48,8
@@
using namespace std;
//=============================================================================
StdMeshers_StartEndLength::StdMeshers_StartEndLength(int hypId,
//=============================================================================
StdMeshers_StartEndLength::StdMeshers_StartEndLength(int hypId,
- int studyId,
SMESH_Gen * gen)
SMESH_Gen * gen)
- :SMESH_Hypothesis(hypId,
studyId,
gen)
+ :SMESH_Hypothesis(hypId, gen)
{
_begLength = 1.;
_endLength = 10.;
{
_begLength = 1.;
_endLength = 10.;
@@
-146,22
+145,22
@@
istream & StdMeshers_StartEndLength::LoadFrom(istream & load)
{
bool isOK = true;
int intVal;
{
bool isOK = true;
int intVal;
- isOK = (load >> _begLength);
+ isOK =
static_cast<bool>
(load >> _begLength);
if (!isOK)
load.clear(ios::badbit | load.rdstate());
if (!isOK)
load.clear(ios::badbit | load.rdstate());
- isOK = (load >> _endLength);
+ isOK =
static_cast<bool>
(load >> _endLength);
if (!isOK)
load.clear(ios::badbit | load.rdstate());
if (!isOK)
load.clear(ios::badbit | load.rdstate());
-
- isOK = (load >> intVal);
+
+ isOK =
static_cast<bool>
(load >> intVal);
if (isOK && intVal > 0) {
_edgeIDs.reserve( intVal );
if (isOK && intVal > 0) {
_edgeIDs.reserve( intVal );
- for (
in
t i = 0; i < _edgeIDs.capacity() && isOK; i++) {
- isOK = (load >> intVal);
+ for (
size_
t i = 0; i < _edgeIDs.capacity() && isOK; i++) {
+ isOK =
static_cast<bool>
(load >> intVal);
if ( isOK ) _edgeIDs.push_back( intVal );
}
if ( isOK ) _edgeIDs.push_back( intVal );
}
- isOK = (load >> _objEntry);
+ isOK =
static_cast<bool>
(load >> _objEntry);
}
return load;
}
return load;
@@
-169,7
+168,7
@@
istream & StdMeshers_StartEndLength::LoadFrom(istream & load)
//=============================================================================
/*!
//=============================================================================
/*!
- *
+ *
*/
//=============================================================================
*/
//=============================================================================