From 0fa128bbd0a53a3428fa2028b8754e15c9ef7c38 Mon Sep 17 00:00:00 2001 From: Andreas Hansson Date: Sat, 20 Sep 2014 17:17:49 -0400 Subject: base: Clean up redundant string functions and use C++11 This patch does a bit of housekeeping on the string helper functions and relies on the C++11 standard library where possible. It also does away with our custom string hash as an implementation is already part of the standard library. --- src/sim/serialize.cc | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'src/sim/serialize.cc') diff --git a/src/sim/serialize.cc b/src/sim/serialize.cc index 18af044d0..27bf87254 100644 --- a/src/sim/serialize.cc +++ b/src/sim/serialize.cc @@ -111,38 +111,25 @@ showParam(ostream &os, const unsigned char &value) } -// Use sscanf() for FP types as to_number() only handles integers template <> bool parseParam(const string &s, float &value) { - return (sscanf(s.c_str(), "%f", &value) == 1); + return to_number(s, value); } template <> bool parseParam(const string &s, double &value) { - return (sscanf(s.c_str(), "%lf", &value) == 1); + return to_number(s, value); } template <> bool parseParam(const string &s, bool &value) { - const string &ls = to_lower(s); - - if (ls == "true") { - value = true; - return true; - } - - if (ls == "false") { - value = false; - return true; - } - - return false; + return to_bool(s, value); } // Display bools as strings -- cgit v1.2.3