Add timezone db version and misc cleanup

This commit is contained in:
Howard Hinnant
2016-01-27 19:59:32 -05:00
parent f6664da11e
commit 5acaffc2b3
2 changed files with 23 additions and 24 deletions

18
tz.cpp
View File

@@ -84,7 +84,7 @@ namespace date
#if _WIN32 // TODO: sensible default for all platforms.
static std::string install{ "c:\\tzdata" };
#else
static std::string install{ "/Users/howardhinnant/Downloads/tzdata2015f" };
static std::string install{ "/Users/howardhinnant/Downloads/tzdata2016a" };
#endif
static const std::vector<std::string> files =
@@ -1906,6 +1906,22 @@ init_tzdb()
throw std::runtime_error(msg);
}
{
std::ifstream infile(path + "Makefile");
while (infile)
{
std::string version;
infile >> version;
if (version == "VERSION=")
{
infile >> db.version;
break;
}
}
if (db.version.empty())
throw std::runtime_error("Unable to get Timezone database version");
}
for (const auto& filename : files)
{
std::ifstream infile(path + filename);