From 541e9eec302bce6aaa167c9604634b2e789a9785 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sat, 26 Sep 2015 12:40:56 -0400 Subject: [PATCH] Context: Initialize ISO8601::weekstart --- src/Context.cpp | 3 +++ src/ISO8601.cpp | 3 +++ src/ISO8601.h | 2 ++ 3 files changed, 8 insertions(+) diff --git a/src/Context.cpp b/src/Context.cpp index 62d879f73..140b04657 100644 --- a/src/Context.cpp +++ b/src/Context.cpp @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -634,6 +635,8 @@ void Context::staticInitialization () TDB2::debug_mode = config.getBoolean ("debug"); + ISO8601d::weekstart = config.get ("weekstart"); + for (auto& rc : config) { if (rc.first.substr (0, 4) == "uda." && diff --git a/src/ISO8601.cpp b/src/ISO8601.cpp index 1a78f218e..998dee123 100644 --- a/src/ISO8601.cpp +++ b/src/ISO8601.cpp @@ -30,6 +30,7 @@ #include #include #include +#include #define DAY 86400 #define HOUR 3600 @@ -105,6 +106,8 @@ static struct #define NUM_DURATIONS (sizeof (durations) / sizeof (durations[0])) +std::string ISO8601d::weekstart = STRING_DATE_SUNDAY; + //////////////////////////////////////////////////////////////////////////////// ISO8601d::ISO8601d () { diff --git a/src/ISO8601.h b/src/ISO8601.h index c55abe634..690bfc16c 100644 --- a/src/ISO8601.h +++ b/src/ISO8601.h @@ -34,6 +34,8 @@ class ISO8601d { public: + static std::string weekstart; + ISO8601d (); ~ISO8601d (); ISO8601d (const ISO8601d&); // Unimplemented