F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

core: (fixes #782) command-line: fix GetDefault

Browse Source
This commit is contained in:
Peter D. Barnes, Jr
2022-10-25 00:30:40 -07:00
committed by Gabriel Ferreira
parent 68557ec32a
commit 8cef417ee1
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/model/command-line.cc
View File

@@ -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();
}

18
src/core/model/command-line.h
View File

@@ -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>