From 8cef417ee18ed5bf5f22da2f912afbb5c7eb4d6a Mon Sep 17 00:00:00 2001
From: "Peter D. Barnes, Jr" <barnes26@llnl.gov>
Date: Tue, 25 Oct 2022 00:30:40 -0700
Subject: [PATCH] core: (fixes #782) command-line: fix GetDefault

---
 src/core/model/command-line.cc | 11 +++++++----
 src/core/model/command-line.h  | 18 ++++++++----------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/core/model/command-line.cc b/src/core/model/command-line.cc
index 024e37d1d..f70386523 100644
--- a/src/core/model/command-line.cc
+++ b/src/core/model/command-line.cc
@@ -849,10 +849,13 @@ CommandLine::StringItem::GetDefault() const
 
 template <>
 std::string
-CommandLineHelper::GetDefault<bool>(const bool& val)
+CommandLineHelper::GetDefault<bool>(const std::string& defaultValue)
 {
+    bool value;
+    std::istringstream iss(defaultValue);
+    iss >> value;
     std::ostringstream oss;
-    oss << std::boolalpha << val;
+    oss << std::boolalpha << value;
     return oss.str();
 }
 
@@ -892,10 +895,10 @@ CommandLineHelper::UserItemParse<bool>(const std::string& value, bool& dest)
 
 template <>
 std::string
-CommandLineHelper::GetDefault<Time>(const Time& val)
+CommandLineHelper::GetDefault<Time>(const std::string& defaultValue)
 {
     std::ostringstream oss;
-    oss << val.As();
+    oss << Time(defaultValue).As();
     return oss.str();
 }
 
diff --git a/src/core/model/command-line.h b/src/core/model/command-line.h
index 371250163..ea91a7c03 100644
--- a/src/core/model/command-line.h
+++ b/src/core/model/command-line.h
@@ -673,16 +673,16 @@ bool UserItemParse<uint8_t>(const std::string& value, uint8_t& dest);
  * \brief Helper to specialize CommandLine::UserItem::GetDefault() on types
  * needing special handling.
  *
- * \param [in] val The argument value
- * \return The string representation of value
+ * \param [in] default The default value from the UserItem.
+ * \return The string representation of value.
  * @{
  */
 template <typename T>
-std::string GetDefault(const T& val);
+std::string GetDefault(const std::string& defaultValue);
 template <>
-std::string GetDefault<bool>(const bool& val);
+std::string GetDefault<bool>(const std::string& defaultValue);
 template <>
-std::string GetDefault<Time>(const Time& val);
+std::string GetDefault<Time>(const std::string& defaultValue);
 /**@}*/
 
 } // namespace CommandLineHelper
@@ -739,16 +739,14 @@ template <typename T>
 std::string
 CommandLine::UserItem<T>::GetDefault() const
 {
-    return CommandLineHelper::GetDefault<T>(*m_valuePtr);
+    return CommandLineHelper::GetDefault<T>(m_default);
 }
 
 template <typename T>
 std::string
-CommandLineHelper::GetDefault(const T& val)
+CommandLineHelper::GetDefault(const std::string& defaultValue)
 {
-    std::ostringstream oss;
-    oss << val;
-    return oss.str();
+    return defaultValue;
 }
 
 template <typename T>