Enable the c++14 CONSTDATA code path for VS2017 and fix const const warning.

This commit is contained in:
gm
2017-01-01 18:01:20 +13:00
parent 6889dc69fb
commit 07d9e8a0fe
2 changed files with 6 additions and 6 deletions
+3 -3
View File
@@ -724,7 +724,7 @@ static
unsigned
parse_dow(std::istream& in)
{
const char*const dow_names[] =
CONSTDATA char*const dow_names[] =
{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
auto s = parse3(in);
auto dow = std::find(std::begin(dow_names), std::end(dow_names), s) - dow_names;
@@ -737,7 +737,7 @@ static
unsigned
parse_month(std::istream& in)
{
const char*const month_names[] =
CONSTDATA char*const month_names[] =
{"Jan", "Feb", "Mar", "Apr", "May", "Jun",
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
auto s = parse3(in);
@@ -2800,7 +2800,7 @@ init_tzdb()
db.version = get_version(path);
#endif // !AUTO_DOWNLOAD
CONSTDATA const char* files[] =
CONSTDATA char*const files[] =
{
"africa", "antarctica", "asia", "australasia", "backward", "etcetera", "europe",
"pacificnew", "northamerica", "southamerica", "systemv", "leapseconds"