From 23b87373b67d491676edc654deeddbcd1b3b8b58 Mon Sep 17 00:00:00 2001 From: Olivier Galibert Date: Sun, 2 May 2021 21:35:15 +0200 Subject: Avoid name collision on Y2 --- src/lib/util/timeconv.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/lib/util/timeconv.h b/src/lib/util/timeconv.h index 29ec6c23515..2eb495a70aa 100644 --- a/src/lib/util/timeconv.h +++ b/src/lib/util/timeconv.h @@ -89,16 +89,16 @@ public: // with a different scale to this arbitrary_clock's scale //--------------------------------------------------------- - template - static time_point from_arbitrary_time_point(const std::chrono::time_point > &tp) + template + static time_point from_arbitrary_time_point(const std::chrono::time_point > &tp) { arbitrary_datetime dt; - dt.year = Y2; - dt.month = M2; - dt.day_of_month = D2; - dt.hour = H2; - dt.minute = N2; - dt.second = S2; + dt.year = YY; + dt.month = MM; + dt.day_of_month = DD; + dt.hour = HH; + dt.minute = NN; + dt.second = SS; const duration adjustment = duration_from_arbitrary_datetime(dt, false); const duration result_duration = std::chrono::duration_cast(tp.time_since_epoch() + adjustment); @@ -111,10 +111,10 @@ public: // of this scale to one of different scale //--------------------------------------------------------- - template - static std::chrono::time_point > to_arbitrary_time_point(const time_point &tp) + template + static std::chrono::time_point > to_arbitrary_time_point(const time_point &tp) { - return arbitrary_clock::from_arbitrary_time_point(tp); + return arbitrary_clock::from_arbitrary_time_point(tp); } -- cgit v1.2.3