Fix compilation errors using gcc-5.X relating to explicit stream::operator bool()

[modules/smesh.git] / src / StdMeshers / StdMeshers_Reversible1D.cxx

diff --git a/src/StdMeshers/StdMeshers_Reversible1D.cxx b/src/StdMeshers/StdMeshers_Reversible1D.cxx
index 6a088119b25f94a429b4b0869522510102733b28..d653bfb0b20188b5f3d0b28ca6447a50d6cf3b87 100644 (file)
--- a/src/StdMeshers/StdMeshers_Reversible1D.cxx
+++ b/src/StdMeshers/StdMeshers_Reversible1D.cxx
@@ -66,7 +66,7 @@ std::ostream & StdMeshers_Reversible1D::SaveTo(std::ostream & save)
 
   if ( !_edgeIDs.empty() )
   {
 
   if ( !_edgeIDs.empty() )
   {

-    for ( size_t i = 0; i < _edgeIDs.size(); i++)
+    for ( size_t i = 0; i < _edgeIDs.size(); i++ )

       save << " " << _edgeIDs[i];
     save << " " << _objEntry << " ";
   }
       save << " " << _edgeIDs[i];
     save << " " << _objEntry << " ";
   }


@@ -76,7 +76,7 @@ std::ostream & StdMeshers_Reversible1D::SaveTo(std::ostream & save)
 
 //=============================================================================
 /*!
 
 //=============================================================================
 /*!

- *  
+ *

  */
 //=============================================================================
 
  */
 //=============================================================================
 


@@ -85,14 +85,14 @@ std::istream & StdMeshers_Reversible1D::LoadFrom(std::istream & load)
   bool isOK;
   int intVal;
 
   bool isOK;
   int intVal;
 

-  isOK = (load >> intVal);
+  isOK = static_cast<bool>(load >> intVal);

   if (isOK && intVal > 0) {
     _edgeIDs.reserve( intVal );
   if (isOK && intVal > 0) {
     _edgeIDs.reserve( intVal );

-    for (int 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;