Consolidate helper functions from options.cpp in one block.

diff --git a/options.cpp b/options.cpp
index 2cf607c841e729c5dec3b9f0fd0714a71ab7d498..76bc997c2c2a9b7521cd6ae49bb70b4fe246edb1 100644 (file)
--- a/options.cpp
+++ b/options.cpp
@@ -78,6 +78,29 @@ namespace opt {
 
 namespace {
 
+    // some helper functions for opt::print()
+
+    const char* on_off(bool b)
+    {
+        return b ? "on" : "off";
+    }
+
+    template <typename T>
+    const char* val_or_string(const T& val, const char* str, const T& deflt = 0)
+    {
+        static std::string res;
+        if (val != deflt) {
+            std::ostringstream oss;
+            oss << val;
+            res = oss.str();
+        } else {
+            res = str;
+        }
+        return res.c_str();
+    }
+
+    // helper function for opt::parse_args()
+
     template <typename T>
     bool nol_find_prefix(const T& nol, const char* descr, std::string& name)
     {
@@ -198,31 +221,6 @@ bool opt::parse_args(int* argc, char* argv[])
     return result;
 }
 
-namespace {
-
-    // some helper functions for opt::print()
-
-    const char* on_off(bool b)
-    {
-        return b ? "on" : "off";
-    }
-
-    template <typename T>
-    const char* val_or_string(const T& val, const char* str, const T& deflt = 0)
-    {
-        static std::string res;
-        if (val != deflt) {
-            std::ostringstream oss;
-            oss << val;
-            res = oss.str();
-        } else {
-            res = str;
-        }
-        return res.c_str();
-    }
-
-} // namespace
-
 void opt::print()
 {
     INFO0(",----[ Simulation parameters ]");