summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2023-01-04 16:43:51 +0000
committerJonathan Wakely <jwakely@redhat.com>2023-05-16 11:15:01 +0100
commit126ffcee89cf3f252c0c89125a64fbe1b0b9255e (patch)
tree29ef63fa8aebc53af4f2e8dbe706a95720fc1a4f
parent1946078b6695bdae44f487d123e49ab549b52012 (diff)
downloadgcc-126ffcee89cf3f252c0c89125a64fbe1b0b9255e.tar.gz
libstdc++: Fix std::chrono::hh_mm_ss with unsigned rep [PR108265]
libstdc++-v3/ChangeLog: PR libstdc++/108265 * include/std/chrono (hh_mm_ss): Do not use chrono::abs if duration rep is unsigned. Remove incorrect noexcept-specifier. * testsuite/std/time/hh_mm_ss/1.cc: Check unsigned rep. Check floating-point representations. Check default construction. (cherry picked from commit e36e57b032b2d70eaa1294d5921e4fd8ce12a74d)
-rw-r--r--libstdc++-v3/include/std/chrono38
-rw-r--r--libstdc++-v3/testsuite/std/time/hh_mm_ss/1.cc54
2 files changed, 79 insertions, 13 deletions
diff --git a/libstdc++-v3/include/std/chrono b/libstdc++-v3/include/std/chrono
index a52304b1738..ca89ce89d87 100644
--- a/libstdc++-v3/include/std/chrono
+++ b/libstdc++-v3/include/std/chrono
@@ -3083,6 +3083,29 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return __width;
}
+ constexpr
+ hh_mm_ss(_Duration __d, bool __is_neg)
+ : _M_is_neg(__is_neg),
+ _M_h (duration_cast<chrono::hours>(__d)),
+ _M_m (duration_cast<chrono::minutes>(__d - hours())),
+ _M_s (duration_cast<chrono::seconds>(__d - hours() - minutes()))
+ {
+ auto __ss = __d - hours() - minutes() - seconds();
+ if constexpr (treat_as_floating_point_v<typename precision::rep>)
+ _M_ss = __ss;
+ else
+ _M_ss = duration_cast<precision>(__ss);
+ }
+
+ static constexpr _Duration
+ _S_abs(_Duration __d)
+ {
+ if constexpr (numeric_limits<typename _Duration::rep>::is_signed)
+ return chrono::abs(__d);
+ else
+ return __d;
+ }
+
public:
static constexpr unsigned fractional_width = {_S_fractional_width()};
@@ -3097,18 +3120,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ }
constexpr explicit
- hh_mm_ss(_Duration __d) noexcept
- : _M_is_neg (__d < _Duration::zero()),
- _M_h (duration_cast<chrono::hours>(abs(__d))),
- _M_m (duration_cast<chrono::minutes>(abs(__d) - hours())),
- _M_s (duration_cast<chrono::seconds>(abs(__d) - hours() - minutes()))
- {
- if constexpr (treat_as_floating_point_v<typename precision::rep>)
- _M_ss = abs(__d) - hours() - minutes() - seconds();
- else
- _M_ss = duration_cast<precision>(abs(__d) - hours()
- - minutes() - seconds());
- }
+ hh_mm_ss(_Duration __d)
+ : hh_mm_ss(_S_abs(__d), __d < _Duration::zero())
+ { }
constexpr bool
is_negative() const noexcept
diff --git a/libstdc++-v3/testsuite/std/time/hh_mm_ss/1.cc b/libstdc++-v3/testsuite/std/time/hh_mm_ss/1.cc
index d3374309034..a61f0095b06 100644
--- a/libstdc++-v3/testsuite/std/time/hh_mm_ss/1.cc
+++ b/libstdc++-v3/testsuite/std/time/hh_mm_ss/1.cc
@@ -59,5 +59,57 @@ constexpr_hh_mm_ss()
static_assert(seconds{hh_mm_ss{100min}} == 100min);
- // TODO: treat_as_floating_point_v
+ // treat_as_floating_point_v
+ using fseconds = duration<double, ratio<1>>;
+ constexpr hh_mm_ss<fseconds> fsec{0x123.0004p5s};
+ static_assert(std::is_same_v<hh_mm_ss<fseconds>::precision, fseconds>);
+ static_assert(fsec.hours() == 2h);
+ static_assert(fsec.minutes() == 35min);
+ static_assert(fsec.seconds() == 12s);
+ static_assert(fsec.subseconds() == 0x.0004p5s);
+ static_assert(!fsec.is_negative());
+ static_assert(fsec.to_duration() == 0x123.0004p5s);
+
+ using fminutes = duration<double, ratio<60>>;
+ constexpr hh_mm_ss<fminutes> fmin{-0x1.23p4min};
+ static_assert(std::is_same_v<hh_mm_ss<fminutes>::precision, fseconds>);
+ static_assert(fmin.hours() == 0h);
+ static_assert(fmin.minutes() == 18min);
+ static_assert(fmin.seconds() == 11s);
+ static_assert(fmin.subseconds() == 0.25s);
+ static_assert(fmin.is_negative());
+ static_assert(fmin.to_duration() == -0x1.23p4min);
+}
+
+constexpr void
+default_construction()
+{
+ using namespace std::chrono;
+
+ constexpr hh_mm_ss<seconds> s1;
+ static_assert(s1.to_duration() == s1.to_duration().zero());
+ constexpr hh_mm_ss<duration<char>> s2;
+ static_assert(s2.to_duration() == s2.to_duration().zero());
+ constexpr hh_mm_ss<duration<int, std::centi>> s3;
+ static_assert(s3.to_duration() == s3.to_duration().zero());
+ constexpr hh_mm_ss<duration<long long, std::femto>> s4;
+ static_assert(s4.to_duration() == s4.to_duration().zero());
+ constexpr hh_mm_ss<duration<double>> s5;
+ static_assert(s5.to_duration() == s5.to_duration().zero());
+}
+
+constexpr void
+unsigned_rep()
+{
+ using namespace std::chrono;
+
+ constexpr duration<unsigned, std::milli> ms(3690001);
+
+ constexpr hh_mm_ss hms(ms); // PR libstdc++/108265
+ static_assert( ! hms.is_negative() );
+ static_assert( hms.to_duration() == milliseconds(ms.count()) );
+ static_assert( hms.hours() == 1h );
+ static_assert( hms.minutes() == 1min );
+ static_assert( hms.seconds() == 30s );
+ static_assert( hms.subseconds() == 1ms );
}