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
Fix compilation errors using gcc-5.X relating to explicit stream::operator bool()
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_StartEndLength.cxx
diff --git
a/src/StdMeshers/StdMeshers_StartEndLength.cxx
b/src/StdMeshers/StdMeshers_StartEndLength.cxx
index dffe92e9a229cae73566fe1ff030db66fcbc3e21..2c230524e49b3f7c45ca77dc444bb14ff9c81916 100644
(file)
--- a/
src/StdMeshers/StdMeshers_StartEndLength.cxx
+++ b/
src/StdMeshers/StdMeshers_StartEndLength.cxx
@@
-146,22
+146,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 );
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;