From 5a01fe003dcb899b84dda09e7eb0fa14277982eb Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Mon, 2 Nov 2015 18:42:16 -0500 Subject: [PATCH] Revert "Col*: Missing paren" This reverts commit e3ea548de06a841ecf7fe4b96a32fb190c47a6d3. --- src/columns/ColDescription.cpp | 4 ++-- src/columns/ColUDA.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/columns/ColDescription.cpp b/src/columns/ColDescription.cpp index 1d2e68729..fa5a3f97d 100644 --- a/src/columns/ColDescription.cpp +++ b/src/columns/ColDescription.cpp @@ -186,7 +186,7 @@ void ColumnDescription::render ( { for (auto& i : annos) { - ISO8601d dt (static_cast (std::stoul (i.first.substr (11)))); + ISO8601d dt (strtol (i.first.substr (11).c_str (), NULL, 10)); description += "\n" + std::string (_indent, ' ') + dt.toString (_dateformat) + " " + i.second; } } @@ -217,7 +217,7 @@ void ColumnDescription::render ( { for (auto& i : annos) { - ISO8601d dt (static_cast (std::stoul (i.first.substr (11)))); + ISO8601d dt (strtol (i.first.substr (11).c_str (), NULL, 10)); description += " " + dt.toString (_dateformat) + " " + i.second; } } diff --git a/src/columns/ColUDA.cpp b/src/columns/ColUDA.cpp index 9efeb4440..cef1122c4 100644 --- a/src/columns/ColUDA.cpp +++ b/src/columns/ColUDA.cpp @@ -88,7 +88,7 @@ void ColumnUDA::measure (Task& task, unsigned int& minimum, unsigned int& maximu // rc.report..dateformat // rc.dateformat.report // rc.dateformat - ISO8601d date (static_cast (std::stoul (value))); + ISO8601d date ((time_t) strtol (value.c_str (), NULL, 10)); std::string format = context.config.get ("report." + _report + ".dateformat"); if (format == "") format = context.config.get ("dateformat.report"); @@ -151,7 +151,7 @@ void ColumnUDA::render ( format = context.config.get ("dateformat"); } - renderStringLeft (lines, width, color, ISO8601d (static_cast (std::stoul (value))).toString (format)); + renderStringLeft (lines, width, color, ISO8601d ((time_t) strtol (value.c_str (), NULL, 10)).toString (format)); } else if (_type == "duration") renderStringRight (lines, width, color, ISO8601p (value).format ());