Use standard macro to check C++ version.

[simgrid.git] / src / xbt / random.cpp

diff --git a/src/xbt/random.cpp b/src/xbt/random.cpp
index 004418eadd9148ef69acec1505c6c2d0b68d8f02..7deb41e70482fb95b7c1b9dd3b2fdc8fc64f48e9 100644 (file)
--- a/src/xbt/random.cpp
+++ b/src/xbt/random.cpp
@@ -19,28 +19,24 @@ namespace simgrid {
 namespace xbt {
 namespace random {
 
-bool Random::read_state(std::string filename)
+bool Random::read_state(const std::string& filename)
 {
   std::ifstream file(filename);
-  if (file) {
-    file >> mt19937_gen;
-    return true;
-  } else {
-    XBT_WARN("Could not open %s and thus not save the RNG state.", filename.c_str());
-    return false;
-  }
+  file >> mt19937_gen;
+  file.close();
+  if (file.fail())
+    XBT_WARN("Could not save the RNG state to file %s.", filename.c_str());
+  return not file.fail();
 }
 
-bool Random::write_state(std::string filename)
+bool Random::write_state(const std::string& filename) const
 {
   std::ofstream file(filename);
-  if (file) {
-    file << mt19937_gen;
-    return false;
-  } else {
-    XBT_WARN("Could not open %s and thus not read the RNG state.", filename.c_str());
-    return false;
-  }
+  file << mt19937_gen;
+  file.close();
+  if (file.fail())
+    XBT_WARN("Could not read the RNG state from file %s.", filename.c_str());
+  return not file.fail();
 }
 
 int StdRandom::uniform_int(int min, int max)
@@ -77,7 +73,7 @@ int XbtRandom::uniform_int(int min, int max)
   do {
     value = mt19937_gen();
   } while (value >= decltype(mt19937_gen)::max() - decltype(mt19937_gen)::max() % range);
-  return value % range + min;
+  return static_cast<int>(value % range + min);
 }
 
 double XbtRandom::uniform_real(double min, double max)
@@ -88,7 +84,7 @@ double XbtRandom::uniform_real(double min, double max)
   do {
     numerator = mt19937_gen() - decltype(mt19937_gen)::min();
   } while (numerator == divisor);
-  return min + (max - min) * numerator / divisor;
+  return min + (max - min) * static_cast<double>(numerator) / divisor;
 }
 
 double XbtRandom::exponential(double lambda)
@@ -123,12 +119,12 @@ void set_mersenne_seed(int seed)
   default_random->set_seed(seed);
 }
 
-bool read_mersenne_state(std::string filename)
+bool read_mersenne_state(const std::string& filename)
 {
   return default_random->read_state(filename);
 }
 
-bool write_mersenne_state(std::string filename)
+bool write_mersenne_state(const std::string& filename)
 {
   return default_random->write_state(filename);
 }