HowardHinnant/date
1
0
Fork 1
mirror of https://github.com/HowardHinnant/date.git synced 2025-08-04 13:14:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Have get_version check for the file named version first

Browse Source
This commit is contained in:
Howard Hinnant
2017-01-01 15:02:08 -05:00
parent 4a1c49152f
commit 2935f80109
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tz.cpp
View File

@@ -2726,8 +2726,17 @@ static
std::string std::string
get_version(const std::string& path) get_version(const std::string& path)
{ {
std::ifstream infile(path + "NEWS");
std::string version; std::string version;
std::ifstream infile(path + "version");
if (infile.is_open())
{
infile >> version;
if (!infile.fail())
return version;
}
else
{
infile.open(path + "NEWS");
while (infile) while (infile)
{ {
infile >> version; infile >> version;
@@ -2737,6 +2746,7 @@ get_version(const std::string& path)
return version; return version;
} }
} }
}
throw std::runtime_error("Unable to get Timezone database version from " + path); throw std::runtime_error("Unable to get Timezone database version from " + path);
} }