3party/date
0
0
Fork 0
mirror of https://github.com/HowardHinnant/date.git synced 2024-12-25 23:40:53 +08:00
Code Issues Projects Releases Wiki Activity

#826 Build fix for ambiguity with >= libc++ 17

Browse Source
This commit is contained in:
Martin Zink 2024-05-08 17:15:38 +02:00 committed by Howard Hinnant
parent 6b1c1b8b3a
commit 8a93211679
23 changed files with 127 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/date/date.h
View File

@ -4228,7 +4228,7 @@ inline
std::basic_ostream<CharT, Traits>& std::basic_ostream<CharT, Traits>&
operator<<(std::basic_ostream<CharT, Traits>& os, const local_time<Duration>& ut) operator<<(std::basic_ostream<CharT, Traits>& os, const local_time<Duration>& ut)
{ {
return (os << sys_time<Duration>{ut.time_since_epoch()}); return (date::operator<<(os, sys_time<Duration>{ut.time_since_epoch()}));
} }
namespace detail namespace detail

2
include/date/ptz.h
View File

@ -667,7 +667,7 @@ time_zone::name() const
auto print_offset = [](seconds off) auto print_offset = [](seconds off)
{ {
std::string nm; std::string nm;
hh_mm_ss<seconds> offset{-off}; date::hh_mm_ss<seconds> offset{-off};
if (offset.is_negative()) if (offset.is_negative())
nm += '-'; nm += '-';
nm += std::to_string(offset.hours().count()); nm += std::to_string(offset.hours().count());

4
include/date/tz.h
View File

@ -231,8 +231,8 @@ nonexistent_local_time::make_msg(local_time<Duration> tp, const local_info& i)
<< i.first.abbrev << " and\n" << i.first.abbrev << " and\n"
<< local_seconds{i.second.begin.time_since_epoch()} + i.second.offset << ' ' << local_seconds{i.second.begin.time_since_epoch()} + i.second.offset << ' '
<< i.second.abbrev << i.second.abbrev
<< " which are both equivalent to\n" << " which are both equivalent to\n";
<< i.first.end << " UTC"; date::operator<<(os, i.first.end) << " UTC";
return os.str(); return os.str();
} }

3
include/date/tz_private.h
View File

@ -289,8 +289,7 @@ struct transition
std::ostream& std::ostream&
operator<<(std::ostream& os, const transition& t) operator<<(std::ostream& os, const transition& t)
{ {
using date::operator<<; date::operator<<(os, t.timepoint) << "Z ";
os << t.timepoint << "Z ";
if (t.info->offset >= std::chrono::seconds{0}) if (t.info->offset >= std::chrono::seconds{0})
os << '+'; os << '+';
os << make_time(t.info->offset); os << make_time(t.info->offset);

3
src/tz.cpp
View File

@ -2729,8 +2729,7 @@ operator<<(std::ostream& os, const time_zone& z)
std::ostream& std::ostream&
operator<<(std::ostream& os, const leap_second& x) operator<<(std::ostream& os, const leap_second& x)
{ {
using namespace date; return date::operator<<(os, x.date_) << " +";
return os << x.date_ << " +";
} }
#if USE_OS_TZDB #if USE_OS_TZDB

1
test/clock_cast_test/local_t.pass.cpp
View File

@ -28,6 +28,7 @@ main()
{ {
using namespace date; using namespace date;
using namespace std::chrono; using namespace std::chrono;
using date::local_days, date::local_t, date::January, date::July, date::Sunday;
// self // self
{ {

1
test/clock_cast_test/noncastable.pass.cpp
View File

@ -191,6 +191,7 @@ main()
using namespace date; using namespace date;
using namespace std::chrono; using namespace std::chrono;
using sys_clock = std::chrono::system_clock; using sys_clock = std::chrono::system_clock;
using local_t = date::local_t;
//steady_clock (must be different that sys_clock) //steady_clock (must be different that sys_clock)
static_assert(is_clock_castable<steady_clock, steady_clock>::value, "steady_clock -> steady_clock"); static_assert(is_clock_castable<steady_clock, steady_clock>::value, "steady_clock -> steady_clock");

56
test/date_test/durations_output.pass.cpp
View File

@ -36,7 +36,7 @@ void test_SI()
// atto // atto
{ {
duration<int, std::atto> d(13); duration<int, std::atto> d(13);
os << d; date::operator<<(os, d);
assert(os.str() == "13as"); assert(os.str() == "13as");
os.str(""); os.str("");
} }
@ -44,7 +44,7 @@ void test_SI()
// femto // femto
{ {
duration<int, std::femto> d(13); duration<int, std::femto> d(13);
os << d; date::operator<<(os, d);
assert(os.str() == "13fs"); assert(os.str() == "13fs");
os.str(""); os.str("");
} }
@ -52,7 +52,7 @@ void test_SI()
// pico // pico
{ {
duration<int, std::pico> d(13); duration<int, std::pico> d(13);
os << d; date::operator<<(os, d);
assert(os.str() == "13ps"); assert(os.str() == "13ps");
os.str(""); os.str("");
} }
@ -60,7 +60,7 @@ void test_SI()
// nano // nano
{ {
duration<int, std::nano> d(13); duration<int, std::nano> d(13);
os << d; date::operator<<(os, d);
assert(os.str() == "13ns"); assert(os.str() == "13ns");
os.str(""); os.str("");
} }
@ -68,7 +68,7 @@ void test_SI()
// mikro // mikro
{ {
duration<int, std::micro> d(13); duration<int, std::micro> d(13);
os << d; date::operator<<(os, d);
assert(os.str() == "13\xC2\xB5s"); assert(os.str() == "13\xC2\xB5s");
os.str(""); os.str("");
} }
@ -76,7 +76,7 @@ void test_SI()
// milli // milli
{ {
duration<int, std::milli> d(13); duration<int, std::milli> d(13);
os << d; date::operator<<(os, d);
assert(os.str() == "13ms"); assert(os.str() == "13ms");
os.str(""); os.str("");
} }
@ -84,7 +84,7 @@ void test_SI()
// centi // centi
{ {
duration<int, std::centi> d(13); duration<int, std::centi> d(13);
os << d; date::operator<<(os, d);
assert(os.str() == "13cs"); assert(os.str() == "13cs");
os.str(""); os.str("");
} }
@ -92,7 +92,7 @@ void test_SI()
// deci // deci
{ {
duration<int, std::deci> d(13); duration<int, std::deci> d(13);
os << d; date::operator<<(os, d);
assert(os.str() == "13ds"); assert(os.str() == "13ds");
os.str(""); os.str("");
} }
@ -100,7 +100,7 @@ void test_SI()
// seconds // seconds
{ {
duration<int> d(13); duration<int> d(13);
os << d; date::operator<<(os, d);
assert(os.str() == "13s"); assert(os.str() == "13s");
os.str(""); os.str("");
} }
@ -108,7 +108,7 @@ void test_SI()
// deca // deca
{ {
duration<int, std::deca> d(13); duration<int, std::deca> d(13);
os << d; date::operator<<(os, d);
assert(os.str() == "13das"); assert(os.str() == "13das");
os.str(""); os.str("");
} }
@ -116,7 +116,7 @@ void test_SI()
// hecto // hecto
{ {
duration<int, std::hecto> d(13); duration<int, std::hecto> d(13);
os << d; date::operator<<(os, d);
assert(os.str() == "13hs"); assert(os.str() == "13hs");
os.str(""); os.str("");
} }
@ -124,7 +124,7 @@ void test_SI()
// kilo // kilo
{ {
duration<int, std::kilo> d(13); duration<int, std::kilo> d(13);
os << d; date::operator<<(os, d);
assert(os.str() == "13ks"); assert(os.str() == "13ks");
os.str(""); os.str("");
} }
@ -132,7 +132,7 @@ void test_SI()
// mega // mega
{ {
duration<int, std::mega> d(13); duration<int, std::mega> d(13);
os << d; date::operator<<(os, d);
assert(os.str() == "13Ms"); assert(os.str() == "13Ms");
os.str(""); os.str("");
} }
@ -140,7 +140,7 @@ void test_SI()
// giga // giga
{ {
duration<int, std::giga> d(13); duration<int, std::giga> d(13);
os << d; date::operator<<(os, d);
assert(os.str() == "13Gs"); assert(os.str() == "13Gs");
os.str(""); os.str("");
} }
@ -148,7 +148,7 @@ void test_SI()
// tera // tera
{ {
duration<int, std::tera> d(13); duration<int, std::tera> d(13);
os << d; date::operator<<(os, d);
assert(os.str() == "13Ts"); assert(os.str() == "13Ts");
os.str(""); os.str("");
} }
@ -156,7 +156,7 @@ void test_SI()
// peta // peta
{ {
duration<int, std::peta> d(13); duration<int, std::peta> d(13);
os << d; date::operator<<(os, d);
assert(os.str() == "13Ps"); assert(os.str() == "13Ps");
os.str(""); os.str("");
} }
@ -164,7 +164,7 @@ void test_SI()
// femto // femto
{ {
duration<int, std::exa> d(13); duration<int, std::exa> d(13);
os << d; date::operator<<(os, d);
assert(os.str() == "13Es"); assert(os.str() == "13Es");
os.str(""); os.str("");
} }
@ -180,7 +180,7 @@ void test_calendar()
// minutes // minutes
{ {
minutes d(13); minutes d(13);
os << d; date::operator<<(os, d);
assert(os.str() == "13min"); assert(os.str() == "13min");
os.str(""); os.str("");
} }
@ -188,7 +188,7 @@ void test_calendar()
// hours // hours
{ {
hours d(13); hours d(13);
os << d; date::operator<<(os, d);
assert(os.str() == "13h"); assert(os.str() == "13h");
os.str(""); os.str("");
} }
@ -196,7 +196,7 @@ void test_calendar()
// days // days
{ {
days d(13); days d(13);
os << d; date::operator<<(os, d);
assert(os.str() == "13d"); assert(os.str() == "13d");
os.str(""); os.str("");
} }
@ -212,7 +212,7 @@ void test_integral_scale()
// ratio 123 / 1 // ratio 123 / 1
{ {
duration<int, std::ratio<123, 1>> d(13); duration<int, std::ratio<123, 1>> d(13);
os << d; date::operator<<(os, d);
assert(os.str() == "13[123]s"); assert(os.str() == "13[123]s");
os.str(""); os.str("");
} }
@ -220,7 +220,7 @@ void test_integral_scale()
// ratio 100 / 4 = ratio 25 / 1 // ratio 100 / 4 = ratio 25 / 1
{ {
duration<int, std::ratio<25, 1>> d(13); duration<int, std::ratio<25, 1>> d(13);
os << d; date::operator<<(os, d);
assert(os.str() == "13[25]s"); assert(os.str() == "13[25]s");
os.str(""); os.str("");
} }
@ -228,7 +228,7 @@ void test_integral_scale()
// weeks = ratio 7 * 24 * 60 * 60 / 1 = ratio 604800 / 1 // weeks = ratio 7 * 24 * 60 * 60 / 1 = ratio 604800 / 1
{ {
weeks d(13); weeks d(13);
os << d; date::operator<<(os, d);
assert(os.str() == "13[604800]s"); assert(os.str() == "13[604800]s");
os.str(""); os.str("");
} }
@ -236,7 +236,7 @@ void test_integral_scale()
// years = 146097/400 days = ratio 146097/400 * 24 * 60 * 60 = ratio 31556952 / 1 // years = 146097/400 days = ratio 146097/400 * 24 * 60 * 60 = ratio 31556952 / 1
{ {
years d(13); years d(13);
os << d; date::operator<<(os, d);
assert(os.str() == "13[31556952]s"); assert(os.str() == "13[31556952]s");
os.str(""); os.str("");
} }
@ -244,7 +244,7 @@ void test_integral_scale()
// months = 1/12 years = ratio 1/12 * 31556952 = ratio 2629746 / 1 // months = 1/12 years = ratio 1/12 * 31556952 = ratio 2629746 / 1
{ {
months d(13); months d(13);
os << d; date::operator<<(os, d);
assert(os.str() == "13[2629746]s"); assert(os.str() == "13[2629746]s");
os.str(""); os.str("");
} }
@ -260,7 +260,7 @@ void test_ratio_scale()
// ratio 1 / 2 // ratio 1 / 2
{ {
duration<int, std::ratio<1, 2>> d(13); duration<int, std::ratio<1, 2>> d(13);
os << d; date::operator<<(os, d);
assert(os.str() == "13[1/2]s"); assert(os.str() == "13[1/2]s");
os.str(""); os.str("");
} }
@ -268,7 +268,7 @@ void test_ratio_scale()
// ratio 100 / 3 // ratio 100 / 3
{ {
duration<int, std::ratio<100, 3>> d(13); duration<int, std::ratio<100, 3>> d(13);
os << d; date::operator<<(os, d);
assert(os.str() == "13[100/3]s"); assert(os.str() == "13[100/3]s");
os.str(""); os.str("");
} }
@ -276,7 +276,7 @@ void test_ratio_scale()
// ratio 100 / 6 = ratio 50 / 3 // ratio 100 / 6 = ratio 50 / 3
{ {
duration<int, std::ratio<100, 6>> d(13); duration<int, std::ratio<100, 6>> d(13);
os << d; date::operator<<(os, d);
assert(os.str() == "13[50/3]s"); assert(os.str() == "13[50/3]s");
os.str(""); os.str("");
} }

42
test/date_test/format/century.pass.cpp
View File

@ -32,86 +32,86 @@ main()
using namespace date; using namespace date;
using namespace std::chrono; using namespace std::chrono;
std::ostringstream os; std::ostringstream os;
os << format("%C", sys_days{jun/1/20001}); os << date::format("%C", sys_days{jun/1/20001});
assert(os.str() == "200"); assert(os.str() == "200");
os.str(""); os.str("");
os << format("%C", sys_days{jun/1/20000}); os << date::format("%C", sys_days{jun/1/20000});
assert(os.str() == "200"); assert(os.str() == "200");
os.str(""); os.str("");
os << format("%C", sys_days{jun/1/19999}); os << date::format("%C", sys_days{jun/1/19999});
assert(os.str() == "199"); assert(os.str() == "199");
os.str(""); os.str("");
os << format("%C", sys_days{jun/1/2001}); os << date::format("%C", sys_days{jun/1/2001});
assert(os.str() == "20"); assert(os.str() == "20");
os.str(""); os.str("");
os << format("%C", sys_days{jun/1/2000}); os << date::format("%C", sys_days{jun/1/2000});
assert(os.str() == "20"); assert(os.str() == "20");
os.str(""); os.str("");
os << format("%C", sys_days{jun/1/1999}); os << date::format("%C", sys_days{jun/1/1999});
assert(os.str() == "19"); assert(os.str() == "19");
os.str(""); os.str("");
os << format("%C", sys_days{jun/1/101}); os << date::format("%C", sys_days{jun/1/101});
assert(os.str() == "01"); assert(os.str() == "01");
os.str(""); os.str("");
os << format("%C", sys_days{jun/1/100}); os << date::format("%C", sys_days{jun/1/100});
assert(os.str() == "01"); assert(os.str() == "01");
os.str(""); os.str("");
os << format("%C", sys_days{jun/1/99}); os << date::format("%C", sys_days{jun/1/99});
assert(os.str() == "00"); assert(os.str() == "00");
os.str(""); os.str("");
os << format("%C", sys_days{jun/1/1}); os << date::format("%C", sys_days{jun/1/1});
assert(os.str() == "00"); assert(os.str() == "00");
os.str(""); os.str("");
os << format("%C", sys_days{jun/1/0}); os << date::format("%C", sys_days{jun/1/0});
assert(os.str() == "00"); assert(os.str() == "00");
os.str(""); os.str("");
os << format("%C", sys_days{jun/1/-1}); os << date::format("%C", sys_days{jun/1/-1});
assert(os.str() == "-01"); assert(os.str() == "-01");
os.str(""); os.str("");
os << format("%C", sys_days{jun/1/-99}); os << date::format("%C", sys_days{jun/1/-99});
assert(os.str() == "-01"); assert(os.str() == "-01");
os.str(""); os.str("");
os << format("%C", sys_days{jun/1/-100}); os << date::format("%C", sys_days{jun/1/-100});
assert(os.str() == "-01"); assert(os.str() == "-01");
os.str(""); os.str("");
os << format("%C", sys_days{jun/1/-101}); os << date::format("%C", sys_days{jun/1/-101});
assert(os.str() == "-02"); assert(os.str() == "-02");
os.str(""); os.str("");
os << format("%C", sys_days{jun/1/-1999}); os << date::format("%C", sys_days{jun/1/-1999});
assert(os.str() == "-20"); assert(os.str() == "-20");
os.str(""); os.str("");
os << format("%C", sys_days{jun/1/-2000}); os << date::format("%C", sys_days{jun/1/-2000});
assert(os.str() == "-20"); assert(os.str() == "-20");
os.str(""); os.str("");
os << format("%C", sys_days{jun/1/-2001}); os << date::format("%C", sys_days{jun/1/-2001});
assert(os.str() == "-21"); assert(os.str() == "-21");
os.str(""); os.str("");
os << format("%C", sys_days{jun/1/-19999}); os << date::format("%C", sys_days{jun/1/-19999});
assert(os.str() == "-200"); assert(os.str() == "-200");
os.str(""); os.str("");
os << format("%C", sys_days{jun/1/-20000}); os << date::format("%C", sys_days{jun/1/-20000});
assert(os.str() == "-200"); assert(os.str() == "-200");
os.str(""); os.str("");
os << format("%C", sys_days{jun/1/-20001}); os << date::format("%C", sys_days{jun/1/-20001});
assert(os.str() == "-201"); assert(os.str() == "-201");
} }

3
test/date_test/format/misc.pass.cpp
View File

@ -29,12 +29,11 @@ void
test(const std::string& in_fmt, const std::string& input, test(const std::string& in_fmt, const std::string& input,
const std::string& out_fmt, const std::string& output) const std::string& out_fmt, const std::string& output)
{ {
using namespace date;
std::istringstream in{input}; std::istringstream in{input};
T t; T t;
in >> parse(in_fmt, t); in >> parse(in_fmt, t);
assert(!in.fail()); assert(!in.fail());
auto s = format(out_fmt, t); auto s = date::format(out_fmt, t);
assert(s == output); assert(s == output);
} }

22
test/date_test/format/range.pass.cpp
View File

@ -40,39 +40,41 @@ main()
using namespace date; using namespace date;
using namespace std::chrono; using namespace std::chrono;
std::ostringstream os; std::ostringstream os;
os << format("%F %T", sys_days{jan/1/year::min()}); using date::year, date::last;
os << date::format("%F %T", sys_days{jan/1/year::min()});
assert(os.str() == "-32767-01-01 00:00:00"); assert(os.str() == "-32767-01-01 00:00:00");
os.str(""); os.str("");
os << format("%F %T", sys_days{dec/last/year::max()}); os << date::format("%F %T", sys_days{dec/last/year::max()});
assert(os.str() == "32767-12-31 00:00:00"); assert(os.str() == "32767-12-31 00:00:00");
os.str(""); os.str("");
os << format("%F %T", sys_days{dec/last/year::max()} + hours{23} + minutes{59} + os << date::format("%F %T", sys_days{dec/last/year::max()} + hours{23} + minutes{59} +
seconds{59} + microseconds{999999}); seconds{59} + microseconds{999999});
assert(os.str() == "32767-12-31 23:59:59.999999"); assert(os.str() == "32767-12-31 23:59:59.999999");
os.str(""); os.str("");
os << format("%Y-%m-%d %H:%M:%S", sys_days{jan/1/year::min()}); os << date::format("%Y-%m-%d %H:%M:%S", sys_days{jan/1/year::min()});
assert(os.str() == "-32767-01-01 00:00:00"); assert(os.str() == "-32767-01-01 00:00:00");
os.str(""); os.str("");
os << format("%Y-%m-%d %H:%M:%S", sys_days{dec/last/year::max()}); os << date::format("%Y-%m-%d %H:%M:%S", sys_days{dec/last/year::max()});
assert(os.str() == "32767-12-31 00:00:00"); assert(os.str() == "32767-12-31 00:00:00");
os.str(""); os.str("");
os << format("%Y-%m-%d %H:%M:%S", sys_days{dec/last/year::max()} + hours{23} + os << date::format("%Y-%m-%d %H:%M:%S", sys_days{dec/last/year::max()} + hours{23} +
minutes{59} + seconds{59} + microseconds{999999}); minutes{59} + seconds{59} + microseconds{999999});
assert(os.str() == "32767-12-31 23:59:59.999999"); assert(os.str() == "32767-12-31 23:59:59.999999");
os.str(""); os.str("");
os << format("%F %T", sys_days{jan/1/year::min()} + microfortnights{1}); os << date::format("%F %T", sys_days{jan/1/year::min()} + microfortnights{1});
assert(os.str() == "-32767-01-01 00:00:01.2096"); assert(os.str() == "-32767-01-01 00:00:01.2096");
os.str(""); os.str("");
os << format("%F %T", sys_days{dec/last/year::max()} + microfortnights{1}); os << date::format("%F %T", sys_days{dec/last/year::max()} + microfortnights{1});
assert(os.str() == "32767-12-31 00:00:01.2096"); assert(os.str() == "32767-12-31 00:00:01.2096");
os.str(""); os.str("");
os << format("%F", jan/1/year::min()); os << date::format("%F", jan/1/year::min());
assert(os.str() == "-32767-01-01"); assert(os.str() == "-32767-01-01");
os.str(""); os.str("");
os << format("%F", dec/last/year::max()); os << date::format("%F", dec/last/year::max());
assert(os.str() == "32767-12-31"); assert(os.str() == "32767-12-31");
os.str(""); os.str("");
} }

44
test/date_test/format/two_dight_year.pass.cpp
View File

@ -32,90 +32,90 @@ main()
using namespace date; using namespace date;
using namespace std::chrono; using namespace std::chrono;
std::ostringstream os; std::ostringstream os;
os << format("%y", sys_days{jun/1/20001}); os << date::format("%y", sys_days{jun/1/20001});
assert(os.str() == "01"); assert(os.str() == "01");
os.str(""); os.str("");
os << format("%y", sys_days{jun/1/20000}); os << date::format("%y", sys_days{jun/1/20000});
assert(os.str() == "00"); assert(os.str() == "00");
os.str(""); os.str("");
os << format("%y", sys_days{jun/1/19999}); os << date::format("%y", sys_days{jun/1/19999});
assert(os.str() == "99"); assert(os.str() == "99");
os.str(""); os.str("");
os << format("%y", sys_days{jun/1/2001}); os << date::format("%y", sys_days{jun/1/2001});
assert(os.str() == "01"); assert(os.str() == "01");
os.str(""); os.str("");
os << format("%y", sys_days{jun/1/2000}); os << date::format("%y", sys_days{jun/1/2000});
assert(os.str() == "00"); assert(os.str() == "00");
os.str(""); os.str("");
os << format("%y", sys_days{jun/1/1999}); os << date::format("%y", sys_days{jun/1/1999});
assert(os.str() == "99"); assert(os.str() == "99");
os.str(""); os.str("");
os << format("%y", sys_days{jun/1/101}); os << date::format("%y", sys_days{jun/1/101});
assert(os.str() == "01"); assert(os.str() == "01");
os.str(""); os.str("");
os << format("%y", sys_days{jun/1/100}); os << date::format("%y", sys_days{jun/1/100});
assert(os.str() == "00"); assert(os.str() == "00");
os.str(""); os.str("");
os << format("%y", sys_days{jun/1/99}); os << date::format("%y", sys_days{jun/1/99});
assert(os.str() == "99"); assert(os.str() == "99");
os.str(""); os.str("");
os << format("%y", sys_days{jun/1/1}); os << date::format("%y", sys_days{jun/1/1});
assert(os.str() == "01"); assert(os.str() == "01");
os.str(""); os.str("");
os << format("%y", sys_days{jun/1/0}); os << date::format("%y", sys_days{jun/1/0});
assert(os.str() == "00"); assert(os.str() == "00");
os.str(""); os.str("");
os << format("%y", sys_days{jun/1/-1}); os << date::format("%y", sys_days{jun/1/-1});
assert(os.str() == "01"); assert(os.str() == "01");
os.str(""); os.str("");
os << format("%y", sys_days{jun/1/-99}); os << date::format("%y", sys_days{jun/1/-99});
assert(os.str() == "99"); assert(os.str() == "99");
os.str(""); os.str("");
os << format("%y", sys_days{jun/1/-100}); os << date::format("%y", sys_days{jun/1/-100});
assert(os.str() == "00"); assert(os.str() == "00");
os.str(""); os.str("");
os << format("%y", sys_days{jun/1/-101}); os << date::format("%y", sys_days{jun/1/-101});
assert(os.str() == "01"); assert(os.str() == "01");
os.str(""); os.str("");
os << format("%y", sys_days{jun/1/-1999}); os << date::format("%y", sys_days{jun/1/-1999});
assert(os.str() == "99"); assert(os.str() == "99");
os.str(""); os.str("");
os << format("%y", sys_days{jun/1/-2000}); os << date::format("%y", sys_days{jun/1/-2000});
assert(os.str() == "00"); assert(os.str() == "00");
os.str(""); os.str("");
os << format("%y", sys_days{jun/1/-2001}); os << date::format("%y", sys_days{jun/1/-2001});
assert(os.str() == "01"); assert(os.str() == "01");
os.str(""); os.str("");
os << format("%y", sys_days{jun/1/-19999}); os << date::format("%y", sys_days{jun/1/-19999});
assert(os.str() == "99"); assert(os.str() == "99");
os.str(""); os.str("");
os << format("%y", sys_days{jun/1/-20000}); os << date::format("%y", sys_days{jun/1/-20000});
assert(os.str() == "00"); assert(os.str() == "00");
os.str(""); os.str("");
os << format("%y", sys_days{jun/1/-20001}); os << date::format("%y", sys_days{jun/1/-20001});
assert(os.str() == "01"); assert(os.str() == "01");
os.str(""); os.str("");
os << format("%y", sys_days{jun/1/year::min()}); os << date::format("%y", sys_days{jun/1/date::year::min()});
assert(os.str() == "67"); assert(os.str() == "67");
} }

11
test/date_test/multi_year_duration_addition.pass.cpp
View File

@ -84,9 +84,10 @@ main()
constexpr ConvertibleToYears custom_year; constexpr ConvertibleToYears custom_year;
constexpr ConvertibleToYearsAndMonths prefer_year; constexpr ConvertibleToYearsAndMonths prefer_year;
using date::last;
{ {
constexpr year_month ym = 2001_y/feb; constexpr date::year_month ym = 2001_y/feb;
CPP14_ASSERT(ym + one_month == 2001_y/mar); CPP14_ASSERT(ym + one_month == 2001_y/mar);
NOEXCEPT_ASSERT(ym + one_month); NOEXCEPT_ASSERT(ym + one_month);
CPP14_ASSERT(one_month + ym == 2001_y/mar); CPP14_ASSERT(one_month + ym == 2001_y/mar);
@ -166,7 +167,7 @@ main()
} }
{ {
constexpr year_month_day ym = 2001_y/feb/10; constexpr date::year_month_day ym = 2001_y/feb/10;
CPP14_ASSERT(ym + one_month == 2001_y/mar/10); CPP14_ASSERT(ym + one_month == 2001_y/mar/10);
NOEXCEPT_ASSERT(ym + one_month); NOEXCEPT_ASSERT(ym + one_month);
CPP14_ASSERT(one_month + ym == 2001_y/mar/10); CPP14_ASSERT(one_month + ym == 2001_y/mar/10);
@ -246,7 +247,7 @@ main()
} }
{ {
constexpr year_month_day_last ym = 2001_y/feb/last; constexpr date::year_month_day_last ym = 2001_y/feb/last;
CPP14_ASSERT(ym + one_month == 2001_y/mar/last); CPP14_ASSERT(ym + one_month == 2001_y/mar/last);
NOEXCEPT_ASSERT(ym + one_month); NOEXCEPT_ASSERT(ym + one_month);
CPP14_ASSERT(one_month + ym == 2001_y/mar/last); CPP14_ASSERT(one_month + ym == 2001_y/mar/last);
@ -326,7 +327,7 @@ main()
} }
{ {
constexpr year_month_weekday ym = 2001_y/feb/fri[4]; constexpr date::year_month_weekday ym = 2001_y/feb/fri[4];
CPP14_ASSERT(ym + one_month == 2001_y/mar/fri[4]); CPP14_ASSERT(ym + one_month == 2001_y/mar/fri[4]);
NOEXCEPT_ASSERT(ym + one_month); NOEXCEPT_ASSERT(ym + one_month);
CPP14_ASSERT(one_month + ym == 2001_y/mar/fri[4]); CPP14_ASSERT(one_month + ym == 2001_y/mar/fri[4]);
@ -406,7 +407,7 @@ main()
} }
{ {
constexpr year_month_weekday_last ym = 2001_y/feb/fri[last]; constexpr date::year_month_weekday_last ym = 2001_y/feb/fri[last];
CPP14_ASSERT(ym + one_month == 2001_y/mar/fri[last]); CPP14_ASSERT(ym + one_month == 2001_y/mar/fri[last]);
NOEXCEPT_ASSERT(ym + one_month); NOEXCEPT_ASSERT(ym + one_month);
CPP14_ASSERT(one_month + ym == 2001_y/mar/fri[last]); CPP14_ASSERT(one_month + ym == 2001_y/mar/fri[last]);

11
test/date_test/parse.pass.cpp
View File

@ -390,6 +390,7 @@ test_F()
{ {
using namespace date; using namespace date;
using namespace std::chrono; using namespace std::chrono;
using date::year_month_day;
{ {
std::istringstream in{"2016-12-13"}; std::istringstream in{"2016-12-13"};
sys_days tp; sys_days tp;
@ -400,7 +401,7 @@ test_F()
} }
{ {
std::istringstream in{"2016-12-13"}; std::istringstream in{"2016-12-13"};
year_month_day tp; year_month_day tp{};
in >> parse("%F", tp); in >> parse("%F", tp);
assert(!in.fail()); assert(!in.fail());
assert(!in.bad()); assert(!in.bad());
@ -413,6 +414,7 @@ test_H()
{ {
using namespace date; using namespace date;
using namespace std::chrono; using namespace std::chrono;
using date::sys_time;
{ {
std::istringstream in{"2016-12-11 15"}; std::istringstream in{"2016-12-11 15"};
sys_time<hours> tp; sys_time<hours> tp;
@ -434,6 +436,7 @@ test_Ip()
{ {
using namespace date; using namespace date;
using namespace std::chrono; using namespace std::chrono;
using date::sys_time;
{ {
std::istringstream in{"2016-12-11 1 pm"}; std::istringstream in{"2016-12-11 1 pm"};
sys_time<hours> tp; sys_time<hours> tp;
@ -507,6 +510,7 @@ test_M()
{ {
using namespace date; using namespace date;
using namespace std::chrono; using namespace std::chrono;
using date::sys_time;
{ {
std::istringstream in{"2016-12-11 15"}; std::istringstream in{"2016-12-11 15"};
sys_time<minutes> tp; sys_time<minutes> tp;
@ -528,6 +532,7 @@ test_S()
{ {
using namespace date; using namespace date;
using namespace std::chrono; using namespace std::chrono;
using date::sys_time;
{ {
std::istringstream in{"2016-12-11 15"}; std::istringstream in{"2016-12-11 15"};
sys_seconds tp; sys_seconds tp;
@ -557,6 +562,7 @@ test_T()
{ {
using namespace date; using namespace date;
using namespace std::chrono; using namespace std::chrono;
using date::sys_time;
{ {
std::istringstream in{"2016-12-11 15:43:22"}; std::istringstream in{"2016-12-11 15:43:22"};
sys_seconds tp; sys_seconds tp;
@ -615,6 +621,7 @@ test_p()
{ {
using namespace date; using namespace date;
using namespace std::chrono; using namespace std::chrono;
using date::sys_time;
{ {
std::istringstream in{"2016-12-11 11pm"}; std::istringstream in{"2016-12-11 11pm"};
sys_time<hours> tp; sys_time<hours> tp;
@ -744,6 +751,7 @@ test_z()
{ {
using namespace date; using namespace date;
using namespace std::chrono; using namespace std::chrono;
using date::local_seconds, date::local_days;
{ {
std::istringstream in{"2016-12-26 15:53:22 -0500"}; std::istringstream in{"2016-12-26 15:53:22 -0500"};
sys_seconds tp; sys_seconds tp;
@ -775,6 +783,7 @@ test_Z()
{ {
using namespace date; using namespace date;
using namespace std::chrono; using namespace std::chrono;
using date::local_seconds, date::local_days;
{ {
std::string a; std::string a;
std::istringstream in{"2016-12-26 15:53:22 word"}; std::istringstream in{"2016-12-26 15:53:22 word"};

8
test/date_test/time_of_day_hours.pass.cpp
View File

@ -79,16 +79,16 @@ main()
static_assert(t1.to_duration() == hours{13}, ""); static_assert(t1.to_duration() == hours{13}, "");
#endif #endif
auto t2 = t1; const auto t2 = t1;
assert(t2.hours() == t1.hours()); assert(t2.hours() == t1.hours());
assert(t2.to_duration() == t1.to_duration()); assert(t2.to_duration() == t1.to_duration());
ostringstream os; ostringstream os;
os << t2; os << t2;
assert(os.str() == "13:00:00"); assert(os.str() == "13:00:00");
auto h = make12(t2.hours()); auto h = date::make12(t2.hours());
os.str(""); os.str("");
assert(h == hours{1}); assert(h == hours{1});
assert(t2.to_duration() == t1.to_duration()); assert(t2.to_duration() == t1.to_duration());
assert(!is_am(t2.hours())); assert(!date::is_am(t2.hours()));
assert(is_pm(t2.hours())); assert(date::is_pm(t2.hours()));
} }

1
test/date_test/year.pass.cpp
View File

@ -90,6 +90,7 @@ main()
{ {
using namespace date; using namespace date;
using namespace std::chrono; using namespace std::chrono;
using date::year;
static_assert(year{2015} == 2015_y, ""); static_assert(year{2015} == 2015_y, "");
static_assert(year{2015} != 2016_y, ""); static_assert(year{2015} != 2016_y, "");

4
test/date_test/year_month.pass.cpp
View File

@ -75,6 +75,9 @@ test_arithmetic()
{ {
using namespace date; using namespace date;
using namespace std::chrono; using namespace std::chrono;
using date::year_month;
using date::year;
using date::month;
for (int y1 = 2010; y1 <= 2015; ++y1) for (int y1 = 2010; y1 <= 2015; ++y1)
{ {
@ -114,6 +117,7 @@ void test_arithemtic_not_ok()
{ {
using namespace date; using namespace date;
using namespace std::chrono; using namespace std::chrono;
using date::year_month, date::month;
year_month ym{2018_y, month{14}}; year_month ym{2018_y, month{14}};

1
test/iso_week/year.pass.cpp
View File

@ -83,6 +83,7 @@ int
main() main()
{ {
using namespace iso_week; using namespace iso_week;
using iso_week::year;
static_assert(year{2015} == 2015_y, ""); static_assert(year{2015} == 2015_y, "");
static_assert(int{year{2015}} == 2015, ""); static_assert(int{year{2015}} == 2015, "");

1
test/posix/ptz.pass.cpp
View File

@ -50,6 +50,7 @@ main()
using namespace date; using namespace date;
using namespace std; using namespace std;
using namespace std::chrono; using namespace std::chrono;
using date::local_days, date::Sunday, date::last;
auto tzi = locate_zone("Australia/Sydney"); auto tzi = locate_zone("Australia/Sydney");
Posix::time_zone tzp{"AEST-10AEDT,M10.1.0,M4.1.0/3"}; Posix::time_zone tzp{"AEST-10AEDT,M10.1.0,M4.1.0/3"};

4
test/tz_test/OffsetZone.h
View File

@ -42,7 +42,7 @@ public:
{ {
using namespace date; using namespace date;
using namespace std::chrono; using namespace std::chrono;
using LT = local_time<std::common_type_t<Duration, minutes>>; using LT = date::local_time<std::common_type_t<Duration, minutes>>;
return LT{(tp + offset_).time_since_epoch()}; return LT{(tp + offset_).time_since_epoch()};
} }
@ -52,7 +52,7 @@ public:
{ {
using namespace date; using namespace date;
using namespace std::chrono; using namespace std::chrono;
using ST = sys_time<std::common_type_t<Duration, minutes>>; using ST = date::sys_time<std::common_type_t<Duration, minutes>>;
return ST{(tp - offset_).time_since_epoch()}; return ST{(tp - offset_).time_since_epoch()};
} }

6
test/tz_test/validate.cpp
View File

@ -9,7 +9,7 @@ test_info(const date::time_zone* zone, const date::sys_info& info)
auto begin = info.begin; auto begin = info.begin;
auto end = info.end - microseconds{1}; auto end = info.end - microseconds{1};
auto mid = begin + (end - begin) /2; auto mid = begin + (end - begin) /2;
using sys_microseconds = sys_time<microseconds>; using sys_microseconds = date::sys_time<microseconds>;
using zoned_microseconds = zoned_time<microseconds>; using zoned_microseconds = zoned_time<microseconds>;
zoned_microseconds local{zone}; zoned_microseconds local{zone};
@ -106,7 +106,7 @@ tzmain()
{ {
std::cout << name << '\n'; std::cout << name << '\n';
auto z = locate_zone(name); auto z = locate_zone(name);
auto begin = sys_days(jan/1/year::min()) + seconds{0}; auto begin = sys_days(jan/1/date::year::min()) + seconds{0};
auto end = sys_days(jan/1/2035) + seconds{0}; auto end = sys_days(jan/1/2035) + seconds{0};
auto info = z->get_info(begin); auto info = z->get_info(begin);
std::cout << "Initially: "; std::cout << "Initially: ";
@ -130,7 +130,7 @@ tzmain()
info.save == prev_save) info.save == prev_save)
continue; continue;
auto dp = floor<days>(begin); auto dp = floor<days>(begin);
auto ymd = year_month_day(dp); auto ymd = date::year_month_day(dp);
auto time = make_time(begin - dp); auto time = make_time(begin - dp);
std::cout << ymd << ' ' << time << "Z "; std::cout << ymd << ' ' << time << "Z ";
if (info.offset >= seconds{0}) if (info.offset >= seconds{0})

1
test/tz_test/zoned_time.pass.cpp
View File

@ -108,6 +108,7 @@ main()
using namespace std; using namespace std;
using namespace std::chrono; using namespace std::chrono;
using namespace date; using namespace date;
using date::sys_time, date::local_days, date::local_seconds;
static_assert( is_nothrow_destructible<zoned_seconds>{}, ""); static_assert( is_nothrow_destructible<zoned_seconds>{}, "");
static_assert( is_default_constructible<zoned_seconds>{}, ""); static_assert( is_default_constructible<zoned_seconds>{}, "");
static_assert( is_nothrow_copy_constructible<zoned_seconds>{}, ""); static_assert( is_nothrow_copy_constructible<zoned_seconds>{}, "");

2
test/tz_test/zoned_time_deduction.pass.cpp
View File

@ -34,6 +34,7 @@ void testDeductionFrom(Source&& s)
{ {
using namespace date; using namespace date;
using namespace std::chrono; using namespace std::chrono;
using date::sys_time, date::local_days, date::local_time;
// No time point // No time point
{ {
@ -148,6 +149,7 @@ main()
{ {
using namespace date; using namespace date;
using namespace std::chrono; using namespace std::chrono;
using date::sys_time, date::local_days, date::local_time;
#if HAS_DEDUCTION_GUIDES #if HAS_DEDUCTION_GUIDES
// no arguments // no arguments