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

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

Browse Source
This commit is contained in:
Martin Zink authored and Howard Hinnant committed 2024-05-10 16:26:43 -04:00
1 parent 6b1c1b8b3a
commit 8a93211679
23 files changed
+127 -106
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

test/date_test/durations_output.pass.cpp
+28 -28
View File
@@ -36,7 +36,7 @@ void test_SI()
// atto
{
duration<int, std::atto> d(13);
os << d;
date::operator<<(os, d);
assert(os.str() == "13as");
os.str("");
}
@@ -44,7 +44,7 @@ void test_SI()
// femto
{
duration<int, std::femto> d(13);
os << d;
date::operator<<(os, d);
assert(os.str() == "13fs");
os.str("");
}
@@ -52,7 +52,7 @@ void test_SI()
// pico
{
duration<int, std::pico> d(13);
os << d;
date::operator<<(os, d);
assert(os.str() == "13ps");
os.str("");
}
@@ -60,7 +60,7 @@ void test_SI()
// nano
{
duration<int, std::nano> d(13);
os << d;
date::operator<<(os, d);
assert(os.str() == "13ns");
os.str("");
}
@@ -68,7 +68,7 @@ void test_SI()
// mikro
{
duration<int, std::micro> d(13);
os << d;
date::operator<<(os, d);
assert(os.str() == "13\xC2\xB5s");
os.str("");
}
@@ -76,7 +76,7 @@ void test_SI()
// milli
{
duration<int, std::milli> d(13);
os << d;
date::operator<<(os, d);
assert(os.str() == "13ms");
os.str("");
}
@@ -84,7 +84,7 @@ void test_SI()
// centi
{
duration<int, std::centi> d(13);
os << d;
date::operator<<(os, d);
assert(os.str() == "13cs");
os.str("");
}
@@ -92,7 +92,7 @@ void test_SI()
// deci
{
duration<int, std::deci> d(13);
os << d;
date::operator<<(os, d);
assert(os.str() == "13ds");
os.str("");
}
@@ -100,7 +100,7 @@ void test_SI()
// seconds
{
duration<int> d(13);
os << d;
date::operator<<(os, d);
assert(os.str() == "13s");
os.str("");
}
@@ -108,7 +108,7 @@ void test_SI()
// deca
{
duration<int, std::deca> d(13);
os << d;
date::operator<<(os, d);
assert(os.str() == "13das");
os.str("");
}
@@ -116,7 +116,7 @@ void test_SI()
// hecto
{
duration<int, std::hecto> d(13);
os << d;
date::operator<<(os, d);
assert(os.str() == "13hs");
os.str("");
}
@@ -124,7 +124,7 @@ void test_SI()
// kilo
{
duration<int, std::kilo> d(13);
os << d;
date::operator<<(os, d);
assert(os.str() == "13ks");
os.str("");
}
@@ -132,7 +132,7 @@ void test_SI()
// mega
{
duration<int, std::mega> d(13);
os << d;
date::operator<<(os, d);
assert(os.str() == "13Ms");
os.str("");
}
@@ -140,7 +140,7 @@ void test_SI()
// giga
{
duration<int, std::giga> d(13);
os << d;
date::operator<<(os, d);
assert(os.str() == "13Gs");
os.str("");
}
@@ -148,7 +148,7 @@ void test_SI()
// tera
{
duration<int, std::tera> d(13);
os << d;
date::operator<<(os, d);
assert(os.str() == "13Ts");
os.str("");
}
@@ -156,7 +156,7 @@ void test_SI()
// peta
{
duration<int, std::peta> d(13);
os << d;
date::operator<<(os, d);
assert(os.str() == "13Ps");
os.str("");
}
@@ -164,7 +164,7 @@ void test_SI()
// femto
{
duration<int, std::exa> d(13);
os << d;
date::operator<<(os, d);
assert(os.str() == "13Es");
os.str("");
}
@@ -180,7 +180,7 @@ void test_calendar()
// minutes
{
minutes d(13);
os << d;
date::operator<<(os, d);
assert(os.str() == "13min");
os.str("");
}
@@ -188,7 +188,7 @@ void test_calendar()
// hours
{
hours d(13);
os << d;
date::operator<<(os, d);
assert(os.str() == "13h");
os.str("");
}
@@ -196,7 +196,7 @@ void test_calendar()
// days
{
days d(13);
os << d;
date::operator<<(os, d);
assert(os.str() == "13d");
os.str("");
}
@@ -212,7 +212,7 @@ void test_integral_scale()
// ratio 123 / 1
{
duration<int, std::ratio<123, 1>> d(13);
os << d;
date::operator<<(os, d);
assert(os.str() == "13[123]s");
os.str("");
}
@@ -220,7 +220,7 @@ void test_integral_scale()
// ratio 100 / 4 = ratio 25 / 1
{
duration<int, std::ratio<25, 1>> d(13);
os << d;
date::operator<<(os, d);
assert(os.str() == "13[25]s");
os.str("");
}
@@ -228,7 +228,7 @@ void test_integral_scale()
// weeks = ratio 7 * 24 * 60 * 60 / 1 = ratio 604800 / 1
{
weeks d(13);
os << d;
date::operator<<(os, d);
assert(os.str() == "13[604800]s");
os.str("");
}
@@ -236,7 +236,7 @@ void test_integral_scale()
// years = 146097/400 days = ratio 146097/400 * 24 * 60 * 60 = ratio 31556952 / 1
{
years d(13);
os << d;
date::operator<<(os, d);
assert(os.str() == "13[31556952]s");
os.str("");
}
@@ -244,7 +244,7 @@ void test_integral_scale()
// months = 1/12 years = ratio 1/12 * 31556952 = ratio 2629746 / 1
{
months d(13);
os << d;
date::operator<<(os, d);
assert(os.str() == "13[2629746]s");
os.str("");
}
@@ -260,7 +260,7 @@ void test_ratio_scale()
// ratio 1 / 2
{
duration<int, std::ratio<1, 2>> d(13);
os << d;
date::operator<<(os, d);
assert(os.str() == "13[1/2]s");
os.str("");
}
@@ -268,7 +268,7 @@ void test_ratio_scale()
// ratio 100 / 3
{
duration<int, std::ratio<100, 3>> d(13);
os << d;
date::operator<<(os, d);
assert(os.str() == "13[100/3]s");
os.str("");
}
@@ -276,7 +276,7 @@ void test_ratio_scale()
// ratio 100 / 6 = ratio 50 / 3
{
duration<int, std::ratio<100, 6>> d(13);
os << d;
date::operator<<(os, d);
assert(os.str() == "13[50/3]s");
os.str("");
}
test/date_test/format/century.pass.cpp
+21 -21
View File
@@ -32,86 +32,86 @@ main()
using namespace date;
using namespace std::chrono;
std::ostringstream os;
os << format("%C", sys_days{jun/1/20001});
os << date::format("%C", sys_days{jun/1/20001});
assert(os.str() == "200");
os.str("");
os << format("%C", sys_days{jun/1/20000});
os << date::format("%C", sys_days{jun/1/20000});
assert(os.str() == "200");
os.str("");
os << format("%C", sys_days{jun/1/19999});
os << date::format("%C", sys_days{jun/1/19999});
assert(os.str() == "199");
os.str("");
os << format("%C", sys_days{jun/1/2001});
os << date::format("%C", sys_days{jun/1/2001});
assert(os.str() == "20");
os.str("");
os << format("%C", sys_days{jun/1/2000});
os << date::format("%C", sys_days{jun/1/2000});
assert(os.str() == "20");
os.str("");
os << format("%C", sys_days{jun/1/1999});
os << date::format("%C", sys_days{jun/1/1999});
assert(os.str() == "19");
os.str("");
os << format("%C", sys_days{jun/1/101});
os << date::format("%C", sys_days{jun/1/101});
assert(os.str() == "01");
os.str("");
os << format("%C", sys_days{jun/1/100});
os << date::format("%C", sys_days{jun/1/100});
assert(os.str() == "01");
os.str("");
os << format("%C", sys_days{jun/1/99});
os << date::format("%C", sys_days{jun/1/99});
assert(os.str() == "00");
os.str("");
os << format("%C", sys_days{jun/1/1});
os << date::format("%C", sys_days{jun/1/1});
assert(os.str() == "00");
os.str("");
os << format("%C", sys_days{jun/1/0});
os << date::format("%C", sys_days{jun/1/0});
assert(os.str() == "00");
os.str("");
os << format("%C", sys_days{jun/1/-1});
os << date::format("%C", sys_days{jun/1/-1});
assert(os.str() == "-01");
os.str("");
os << format("%C", sys_days{jun/1/-99});
os << date::format("%C", sys_days{jun/1/-99});
assert(os.str() == "-01");
os.str("");
os << format("%C", sys_days{jun/1/-100});
os << date::format("%C", sys_days{jun/1/-100});
assert(os.str() == "-01");
os.str("");
os << format("%C", sys_days{jun/1/-101});
os << date::format("%C", sys_days{jun/1/-101});
assert(os.str() == "-02");
os.str("");
os << format("%C", sys_days{jun/1/-1999});
os << date::format("%C", sys_days{jun/1/-1999});
assert(os.str() == "-20");
os.str("");
os << format("%C", sys_days{jun/1/-2000});
os << date::format("%C", sys_days{jun/1/-2000});
assert(os.str() == "-20");
os.str("");
os << format("%C", sys_days{jun/1/-2001});
os << date::format("%C", sys_days{jun/1/-2001});
assert(os.str() == "-21");
os.str("");
os << format("%C", sys_days{jun/1/-19999});
os << date::format("%C", sys_days{jun/1/-19999});
assert(os.str() == "-200");
os.str("");
os << format("%C", sys_days{jun/1/-20000});
os << date::format("%C", sys_days{jun/1/-20000});
assert(os.str() == "-200");
os.str("");
os << format("%C", sys_days{jun/1/-20001});
os << date::format("%C", sys_days{jun/1/-20001});
assert(os.str() == "-201");
}
test/date_test/format/misc.pass.cpp
+1 -2
View File
@@ -29,12 +29,11 @@ void
test(const std::string& in_fmt, const std::string& input,
const std::string& out_fmt, const std::string& output)
{
using namespace date;
std::istringstream in{input};
T t;
in >> parse(in_fmt, t);
assert(!in.fail());
auto s = format(out_fmt, t);
auto s = date::format(out_fmt, t);
assert(s == output);
}
test/date_test/format/range.pass.cpp
+12 -10
View File
@@ -40,39 +40,41 @@ main()
using namespace date;
using namespace std::chrono;
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");
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");
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});
assert(os.str() == "32767-12-31 23:59:59.999999");
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");
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");
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});
assert(os.str() == "32767-12-31 23:59:59.999999");
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");
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");
os.str("");
os << format("%F", jan/1/year::min());
os << date::format("%F", jan/1/year::min());
assert(os.str() == "-32767-01-01");
os.str("");
os << format("%F", dec/last/year::max());
os << date::format("%F", dec/last/year::max());
assert(os.str() == "32767-12-31");
os.str("");
}
test/date_test/format/two_dight_year.pass.cpp
+22 -22
View File
@@ -32,90 +32,90 @@ main()
using namespace date;
using namespace std::chrono;
std::ostringstream os;
os << format("%y", sys_days{jun/1/20001});
os << date::format("%y", sys_days{jun/1/20001});
assert(os.str() == "01");
os.str("");
os << format("%y", sys_days{jun/1/20000});
os << date::format("%y", sys_days{jun/1/20000});
assert(os.str() == "00");
os.str("");
os << format("%y", sys_days{jun/1/19999});
os << date::format("%y", sys_days{jun/1/19999});
assert(os.str() == "99");
os.str("");
os << format("%y", sys_days{jun/1/2001});
os << date::format("%y", sys_days{jun/1/2001});
assert(os.str() == "01");
os.str("");
os << format("%y", sys_days{jun/1/2000});
os << date::format("%y", sys_days{jun/1/2000});
assert(os.str() == "00");
os.str("");
os << format("%y", sys_days{jun/1/1999});
os << date::format("%y", sys_days{jun/1/1999});
assert(os.str() == "99");
os.str("");
os << format("%y", sys_days{jun/1/101});
os << date::format("%y", sys_days{jun/1/101});
assert(os.str() == "01");
os.str("");
os << format("%y", sys_days{jun/1/100});
os << date::format("%y", sys_days{jun/1/100});
assert(os.str() == "00");
os.str("");
os << format("%y", sys_days{jun/1/99});
os << date::format("%y", sys_days{jun/1/99});
assert(os.str() == "99");
os.str("");
os << format("%y", sys_days{jun/1/1});
os << date::format("%y", sys_days{jun/1/1});
assert(os.str() == "01");
os.str("");
os << format("%y", sys_days{jun/1/0});
os << date::format("%y", sys_days{jun/1/0});
assert(os.str() == "00");
os.str("");
os << format("%y", sys_days{jun/1/-1});
os << date::format("%y", sys_days{jun/1/-1});
assert(os.str() == "01");
os.str("");
os << format("%y", sys_days{jun/1/-99});
os << date::format("%y", sys_days{jun/1/-99});
assert(os.str() == "99");
os.str("");
os << format("%y", sys_days{jun/1/-100});
os << date::format("%y", sys_days{jun/1/-100});
assert(os.str() == "00");
os.str("");
os << format("%y", sys_days{jun/1/-101});
os << date::format("%y", sys_days{jun/1/-101});
assert(os.str() == "01");
os.str("");
os << format("%y", sys_days{jun/1/-1999});
os << date::format("%y", sys_days{jun/1/-1999});
assert(os.str() == "99");
os.str("");
os << format("%y", sys_days{jun/1/-2000});
os << date::format("%y", sys_days{jun/1/-2000});
assert(os.str() == "00");
os.str("");
os << format("%y", sys_days{jun/1/-2001});
os << date::format("%y", sys_days{jun/1/-2001});
assert(os.str() == "01");
os.str("");
os << format("%y", sys_days{jun/1/-19999});
os << date::format("%y", sys_days{jun/1/-19999});
assert(os.str() == "99");
os.str("");
os << format("%y", sys_days{jun/1/-20000});
os << date::format("%y", sys_days{jun/1/-20000});
assert(os.str() == "00");
os.str("");
os << format("%y", sys_days{jun/1/-20001});
os << date::format("%y", sys_days{jun/1/-20001});
assert(os.str() == "01");
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");
}
test/date_test/multi_year_duration_addition.pass.cpp
+6 -5
View File
@@ -84,9 +84,10 @@ main()
constexpr ConvertibleToYears custom_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);
NOEXCEPT_ASSERT(ym + one_month);
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);
NOEXCEPT_ASSERT(ym + one_month);
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);
NOEXCEPT_ASSERT(ym + one_month);
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]);
NOEXCEPT_ASSERT(ym + one_month);
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]);
NOEXCEPT_ASSERT(ym + one_month);
CPP14_ASSERT(one_month + ym == 2001_y/mar/fri[last]);
test/date_test/parse.pass.cpp
+10 -1
View File
@@ -390,6 +390,7 @@ test_F()
{
using namespace date;
using namespace std::chrono;
using date::year_month_day;
{
std::istringstream in{"2016-12-13"};
sys_days tp;
@@ -400,7 +401,7 @@ test_F()
}
{
std::istringstream in{"2016-12-13"};
year_month_day tp;
year_month_day tp{};
in >> parse("%F", tp);
assert(!in.fail());
assert(!in.bad());
@@ -413,6 +414,7 @@ test_H()
{
using namespace date;
using namespace std::chrono;
using date::sys_time;
{
std::istringstream in{"2016-12-11 15"};
sys_time<hours> tp;
@@ -434,6 +436,7 @@ test_Ip()
{
using namespace date;
using namespace std::chrono;
using date::sys_time;
{
std::istringstream in{"2016-12-11 1 pm"};
sys_time<hours> tp;
@@ -507,6 +510,7 @@ test_M()
{
using namespace date;
using namespace std::chrono;
using date::sys_time;
{
std::istringstream in{"2016-12-11 15"};
sys_time<minutes> tp;
@@ -528,6 +532,7 @@ test_S()
{
using namespace date;
using namespace std::chrono;
using date::sys_time;
{
std::istringstream in{"2016-12-11 15"};
sys_seconds tp;
@@ -557,6 +562,7 @@ test_T()
{
using namespace date;
using namespace std::chrono;
using date::sys_time;
{
std::istringstream in{"2016-12-11 15:43:22"};
sys_seconds tp;
@@ -615,6 +621,7 @@ test_p()
{
using namespace date;
using namespace std::chrono;
using date::sys_time;
{
std::istringstream in{"2016-12-11 11pm"};
sys_time<hours> tp;
@@ -744,6 +751,7 @@ test_z()
{
using namespace date;
using namespace std::chrono;
using date::local_seconds, date::local_days;
{
std::istringstream in{"2016-12-26 15:53:22 -0500"};
sys_seconds tp;
@@ -775,6 +783,7 @@ test_Z()
{
using namespace date;
using namespace std::chrono;
using date::local_seconds, date::local_days;
{
std::string a;
std::istringstream in{"2016-12-26 15:53:22 word"};
test/date_test/time_of_day_hours.pass.cpp
+4 -4
View File
@@ -79,16 +79,16 @@ main()
static_assert(t1.to_duration() == hours{13}, "");
#endif
auto t2 = t1;
const auto t2 = t1;
assert(t2.hours() == t1.hours());
assert(t2.to_duration() == t1.to_duration());
ostringstream os;
os << t2;
assert(os.str() == "13:00:00");
auto h = make12(t2.hours());
auto h = date::make12(t2.hours());
os.str("");
assert(h == hours{1});
assert(t2.to_duration() == t1.to_duration());
assert(!is_am(t2.hours()));
assert(is_pm(t2.hours()));
assert(!date::is_am(t2.hours()));
assert(date::is_pm(t2.hours()));
}
test/date_test/year.pass.cpp
+1
View File
@@ -90,6 +90,7 @@ main()
{
using namespace date;
using namespace std::chrono;
using date::year;
static_assert(year{2015} == 2015_y, "");
static_assert(year{2015} != 2016_y, "");
test/date_test/year_month.pass.cpp
+4
View File
@@ -75,6 +75,9 @@ test_arithmetic()
{
using namespace date;
using namespace std::chrono;
using date::year_month;
using date::year;
using date::month;
for (int y1 = 2010; y1 <= 2015; ++y1)
{
@@ -114,6 +117,7 @@ void test_arithemtic_not_ok()
{
using namespace date;
using namespace std::chrono;
using date::year_month, date::month;
year_month ym{2018_y, month{14}};