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
0023505: Sigsegv with fuse on cylinder and cone
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_Arithmetic1D.cxx
diff --git
a/src/StdMeshers/StdMeshers_Arithmetic1D.cxx
b/src/StdMeshers/StdMeshers_Arithmetic1D.cxx
index 2642dd1af0db6b91a7af20c067dfc6bb5a3c51e9..a06202a8e925228ae6311d830df07c65f16bdfa8 100644
(file)
--- a/
src/StdMeshers/StdMeshers_Arithmetic1D.cxx
+++ b/
src/StdMeshers/StdMeshers_Arithmetic1D.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
@@
-144,22
+144,22
@@
istream & StdMeshers_Arithmetic1D::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 );
for ( size_t i = 0; i < _edgeIDs.capacity() && isOK; i++) {
if (isOK && intVal > 0) {
_edgeIDs.reserve( intVal );
for ( size_t i = 0; i < _edgeIDs.capacity() && isOK; i++) {
- isOK = (load >> intVal);
+ 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;