From b215d6292511af5899a71434807351209d63cd87 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Thu, 30 Apr 2015 16:09:40 -0700 Subject: [PATCH] Replace 'using make_week_num' with a macro; gcc-4.8 can't do that kind of alias. --- src/libqof/qof/gnc-timezone.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/libqof/qof/gnc-timezone.cpp b/src/libqof/qof/gnc-timezone.cpp index 693c321380..4cbe8ad372 100644 --- a/src/libqof/qof/gnc-timezone.cpp +++ b/src/libqof/qof/gnc-timezone.cpp @@ -129,12 +129,13 @@ windows_tz_names (HKEY key) return time_zone_names (std_name, std_name, dlt_name, dlt_name); } +#define make_week_num(x) static_cast::week_num>(x) + static TZ_Ptr zone_from_regtzi (const RegTZI& regtzi, time_zone_names names) { using ndate = boost::gregorian::nth_day_of_the_week_in_month; using nth_day_rule = boost::local_time::nth_day_of_the_week_in_month_dst_rule; - using make_week_num = static_cast::week_num>; duration std_off (0, regtzi.StandardBias - regtzi.Bias, 0); duration dlt_off (0, regtzi.DaylightBias, 0); @@ -225,8 +226,6 @@ TimeZoneProvider::load_windows_classic_tz (HKEY key, time_zone_names names) RegCloseKey (key); } -TimeZoneProvider::TimeZoneProvider () : TimeZoneProvider ("")) {} - TimeZoneProvider::TimeZoneProvider (const std::string& identifier) : zone_vector () {