Make sentinels constexpr and move them

espressomd · Jan 22, 2020 · 3f29600 · 3f29600
1 parent ede6e7e
commit 3f29600
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/src/core/thermostat.cpp b/src/core/thermostat.cpp
@@ -41,19 +41,6 @@ bool thermo_virtual = true;
 
 using Thermostat::GammaType;
 
-namespace {
-/** @name Integrators parameters sentinels.
- *  These functions return the sentinel value for the Langevin/Brownian
- *  parameters, indicating that they have not been set yet.
- */
-/*@{*/
-constexpr double sentinel(double) { return -1.0; }
-Utils::Vector3d sentinel(Utils::Vector3d) { return {-1.0, -1.0, -1.0}; }
-constexpr double set_nan(double) { return NAN; }
-Utils::Vector3d set_nan(Utils::Vector3d) { return {NAN, NAN, NAN}; }
-/*@}*/
-} // namespace
-
 GammaType langevin_gamma = sentinel(GammaType{});
 GammaType langevin_gamma_rotation = sentinel(GammaType{});
 GammaType langevin_pref1;

diff --git a/src/core/thermostat.hpp b/src/core/thermostat.hpp
@@ -59,6 +59,21 @@ using GammaType = double;
 #endif
 } // namespace Thermostat
 
+namespace {
+/** @name Integrators parameters sentinels.
+ *  These functions return the sentinel value for the Langevin/Brownian
+ *  parameters, indicating that they have not been set yet.
+ */
+/*@{*/
+constexpr double sentinel(double) { return -1.0; }
+constexpr Utils::Vector3d sentinel(Utils::Vector3d) {
+  return {-1.0, -1.0, -1.0};
+}
+constexpr double set_nan(double) { return NAN; }
+constexpr Utils::Vector3d set_nan(Utils::Vector3d) { return {NAN, NAN, NAN}; }
+/*@}*/
+} // namespace
+
 /************************************************
  * exported variables
  ************************************************/