3party/date
0
0
Fork 0
mirror of https://github.com/HowardHinnant/date.git synced 2025-01-14 01:37:57 +08:00
Code Issues Projects Releases Wiki Activity

Rename link to time_zone_link

Browse Source 
* At the request of LEWG
This commit is contained in:
Howard Hinnant 2019-11-08 19:36:09 +00:00
parent 224c71a899
commit 3e376be2e9
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
include/date/tz.h
View File

@ -964,27 +964,29 @@ time_zone::to_sys_impl(local_time<Duration> tp, choose, std::true_type) const
#if !USE_OS_TZDB #if !USE_OS_TZDB
class link class time_zone_link
{ {
private: private:
std::string name_; std::string name_;
std::string target_; std::string target_;
public: public:
DATE_API explicit link(const std::string& s); DATE_API explicit time_zone_link(const std::string& s);
const std::string& name() const {return name_;} const std::string& name() const {return name_;}
const std::string& target() const {return target_;} const std::string& target() const {return target_;}
friend bool operator==(const link& x, const link& y) {return x.name_ == y.name_;} friend bool operator==(const time_zone_link& x, const time_zone_link& y) {return x.name_ == y.name_;}
friend bool operator< (const link& x, const link& y) {return x.name_ < y.name_;} friend bool operator< (const time_zone_link& x, const time_zone_link& y) {return x.name_ < y.name_;}
friend DATE_API std::ostream& operator<<(std::ostream& os, const link& x); friend DATE_API std::ostream& operator<<(std::ostream& os, const time_zone_link& x);
}; };
inline bool operator!=(const link& x, const link& y) {return !(x == y);} using link = time_zone_link;
inline bool operator> (const link& x, const link& y) {return y < x;}
inline bool operator<=(const link& x, const link& y) {return !(y < x);} inline bool operator!=(const time_zone_link& x, const time_zone_link& y) {return !(x == y);}
inline bool operator>=(const link& x, const link& y) {return !(x < y);} inline bool operator> (const time_zone_link& x, const time_zone_link& y) {return y < x;}
inline bool operator<=(const time_zone_link& x, const time_zone_link& y) {return !(y < x);}
inline bool operator>=(const time_zone_link& x, const time_zone_link& y) {return !(x < y);}
#endif // !USE_OS_TZDB #endif // !USE_OS_TZDB
@ -1155,16 +1157,16 @@ struct timezone_mapping
struct tzdb struct tzdb
{ {
std::string version = "unknown"; std::string version = "unknown";
std::vector<time_zone> zones; std::vector<time_zone> zones;
#if !USE_OS_TZDB #if !USE_OS_TZDB
std::vector<link> links; std::vector<time_zone_link> links;
#endif #endif
#if !MISSING_LEAP_SECONDS #if !MISSING_LEAP_SECONDS
std::vector<leap_second> leap_seconds; std::vector<leap_second> leap_seconds;
#endif #endif
#if !USE_OS_TZDB #if !USE_OS_TZDB
std::vector<detail::Rule> rules; std::vector<detail::Rule> rules;
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
std::vector<detail::timezone_mapping> mappings; std::vector<detail::timezone_mapping> mappings;

12
src/tz.cpp
View File

@ -2720,9 +2720,9 @@ init_tzdb()
#else // !USE_OS_TZDB #else // !USE_OS_TZDB
// link // time_zone_link
link::link(const std::string& s) time_zone_link::time_zone_link(const std::string& s)
{ {
using namespace date; using namespace date;
std::istringstream in(s); std::istringstream in(s);
@ -2732,7 +2732,7 @@ link::link(const std::string& s)
} }
std::ostream& std::ostream&
operator<<(std::ostream& os, const link& x) operator<<(std::ostream& os, const time_zone_link& x)
{ {
using namespace date; using namespace date;
detail::save_ostream<char> _(os); detail::save_ostream<char> _(os);
@ -3438,7 +3438,7 @@ init_tzdb()
} }
else if (word == "Link") else if (word == "Link")
{ {
db->links.push_back(link(line)); db->links.push_back(time_zone_link(line));
continue_zone = false; continue_zone = false;
} }
else if (word == "Leap") else if (word == "Leap")
@ -3521,9 +3521,9 @@ tzdb::locate_zone(const std::string& tz_name) const
#if !USE_OS_TZDB #if !USE_OS_TZDB
auto li = std::lower_bound(links.begin(), links.end(), tz_name, auto li = std::lower_bound(links.begin(), links.end(), tz_name,
#if HAS_STRING_VIEW #if HAS_STRING_VIEW
[](const link& z, const std::string_view& nm) [](const time_zone_link& z, const std::string_view& nm)
#else #else
[](const link& z, const std::string& nm) [](const time_zone_link& z, const std::string& nm)
#endif #endif
{ {
return z.name() < nm; return z.name() < nm;