IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Replace 'using make_week_num' with a macro; gcc-4.8 can't do that kind of alias.

Browse Source
This commit is contained in:
John Ralls 2015-04-30 16:09:40 -07:00
parent 9fafb61283
commit b215d62925
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/libqof/qof/gnc-timezone.cpp
View File

@ -129,12 +129,13 @@ windows_tz_names (HKEY key)
return time_zone_names (std_name, std_name, dlt_name, dlt_name); return time_zone_names (std_name, std_name, dlt_name, dlt_name);
} }
#define make_week_num(x) static_cast<boost::date_time::nth_kday_of_month<boost::gregorian::date>::week_num>(x)
static TZ_Ptr static TZ_Ptr
zone_from_regtzi (const RegTZI& regtzi, time_zone_names names) zone_from_regtzi (const RegTZI& regtzi, time_zone_names names)
{ {
using ndate = boost::gregorian::nth_day_of_the_week_in_month; 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 nth_day_rule = boost::local_time::nth_day_of_the_week_in_month_dst_rule;
using make_week_num = static_cast<boost::date_time::nth_kday_of_month<boost::gregorian::date>::week_num>;
duration std_off (0, regtzi.StandardBias - regtzi.Bias, 0); duration std_off (0, regtzi.StandardBias - regtzi.Bias, 0);
duration dlt_off (0, regtzi.DaylightBias, 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); RegCloseKey (key);
} }
TimeZoneProvider::TimeZoneProvider () : TimeZoneProvider ("")) {}
TimeZoneProvider::TimeZoneProvider (const std::string& identifier) : TimeZoneProvider::TimeZoneProvider (const std::string& identifier) :
zone_vector () zone_vector ()
{ {