feedc0de/date
1
0
Fork 0
forked from HowardHinnant/date
Code Pull Requests Activity

Protect is_am and make12 from ADL

Browse Source
This commit is contained in:
Howard Hinnant
2019-09-17 15:48:15 -04:00
parent 44344000f0
commit a5c4b4ebf8
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/date/date.h
View File

@@ -5136,7 +5136,7 @@ to_stream(std::basic_ostream<CharT, Traits>& os, const CharT* fmt,
if (modified == CharT{}) if (modified == CharT{})
#endif #endif
{ {
auto h = *fmt == CharT{'I'} ? make12(hms.hours()) : hms.hours(); auto h = *fmt == CharT{'I'} ? date::make12(hms.hours()) : hms.hours();
if (h < hours{10}) if (h < hours{10})
os << CharT{'0'}; os << CharT{'0'};
os << h.count(); os << h.count();
@@ -5292,7 +5292,7 @@ to_stream(std::basic_ostream<CharT, Traits>& os, const CharT* fmt,
tm.tm_hour = static_cast<int>(fds.tod.hours().count()); tm.tm_hour = static_cast<int>(fds.tod.hours().count());
facet.put(os, os, os.fill(), &tm, std::begin(f), std::end(f)); facet.put(os, os, os.fill(), &tm, std::begin(f), std::end(f));
#else #else
if (is_am(fds.tod.hours())) if (date::is_am(fds.tod.hours()))
os << ampm_names().first[0]; os << ampm_names().first[0];
else else
os << ampm_names().first[1]; os << ampm_names().first[1];
@@ -5350,12 +5350,12 @@ to_stream(std::basic_ostream<CharT, Traits>& os, const CharT* fmt,
save_ostream<CharT, Traits> _(os); save_ostream<CharT, Traits> _(os);
os.fill('0'); os.fill('0');
os.width(2); os.width(2);
os << make12(tod.hours()).count() << CharT{':'}; os << date::make12(tod.hours()).count() << CharT{':'};
os.width(2); os.width(2);
os << tod.minutes().count() << CharT{':'}; os << tod.minutes().count() << CharT{':'};
os.width(2); os.width(2);
os << tod.seconds().count() << CharT{' '}; os << tod.seconds().count() << CharT{' '};
if (is_am(tod.hours())) if (date::is_am(tod.hours()))
os << ampm_names().first[0]; os << ampm_names().first[0];
else else
os << ampm_names().first[1]; os << ampm_names().first[1];