From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 396C23857C45; Thu, 22 Dec 2022 10:15:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 396C23857C45 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1671704110; bh=nbpbmNmZl0l+yT2/aumq9+1Qc5HkMNMweT7Q3wO45Ls=; h=From:To:Subject:Date:From; b=K+yB8bmykZhkT3Irk4xhGAZSGdyOpcNa6k2b0Yb8WQyJQNW4V+nlSFVRWCkUHkZCR +EEJGZ/Hb8m2e0C6jHVnvr5HWA+ezkWrdAr6gY2afGrQBOi+3iOdFCkbdUJ5A6sgEm BW5XY5W8Sw208mz2xW8j4oP4m+vFTznRGQVGvlCg= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-4841] libstdc++: Define and use variable templates in X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: ec8f914f572ce45dbf5743c801c6a101e9a785c7 X-Git-Newrev: d2d3826cd4ba78a97a4906054262a9eb90abde1a Message-Id: <20221222101510.396C23857C45@sourceware.org> Date: Thu, 22 Dec 2022 10:15:10 +0000 (GMT) List-Id: https://gcc.gnu.org/g:d2d3826cd4ba78a97a4906054262a9eb90abde1a commit r13-4841-gd2d3826cd4ba78a97a4906054262a9eb90abde1a Author: Jonathan Wakely Date: Thu Dec 22 00:23:19 2022 +0000 libstdc++: Define and use variable templates in Thi defines a variable template for the internal __is_duration helper trait, defines a new __is_time_point_v variable template (to be used in a subsequent commit), and adds explicit specializations of the standard chrono::treat_as_floating_point trait for common types. A fast path is added to chrono::duration_cast for the no-op case where no conversion is needed. Finally, some SFINAE constraints are simplified by using the __enable_if_t alias, or by using variable templates. libstdc++-v3/ChangeLog: * include/bits/chrono.h (__is_duration_v, __is_time_point_v): New variable templates. (duration_cast): Add simplified definition for noconv case. (treat_as_floating_point_v): Add explicit specializations. (duration::operator%=, floor, ceil, round): Simplify SFINAE constraints. Diff: --- libstdc++-v3/include/bits/chrono.h | 62 +++++++++++++++++++++++++++----------- 1 file changed, 45 insertions(+), 17 deletions(-) diff --git a/libstdc++-v3/include/bits/chrono.h b/libstdc++-v3/include/bits/chrono.h index 22c0be3fbe6..56751d1c3a0 100644 --- a/libstdc++-v3/include/bits/chrono.h +++ b/libstdc++-v3/include/bits/chrono.h @@ -244,6 +244,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION using __disable_if_is_duration = typename enable_if::value, _Tp>::type; +#if __cpp_variable_templates + template + inline constexpr bool __is_duration_v = false; + template + inline constexpr bool __is_duration_v> = true; + template + inline constexpr bool __is_time_point_v = false; + template + inline constexpr bool __is_time_point_v> = true; +#endif + /// @endcond /** Convert a `duration` to type `ToDur`. @@ -261,13 +272,20 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION constexpr __enable_if_is_duration<_ToDur> duration_cast(const duration<_Rep, _Period>& __d) { - typedef typename _ToDur::period __to_period; - typedef typename _ToDur::rep __to_rep; - typedef ratio_divide<_Period, __to_period> __cf; - typedef typename common_type<__to_rep, _Rep, intmax_t>::type __cr; - typedef __duration_cast_impl<_ToDur, __cf, __cr, - __cf::num == 1, __cf::den == 1> __dc; - return __dc::__cast(__d); +#if __cpp_inline_variables && __cpp_if_constexpr + if constexpr (is_same_v<_ToDur, duration<_Rep, _Period>>) + return __d; + else +#endif + { + using __to_period = typename _ToDur::period; + using __to_rep = typename _ToDur::rep; + using __cf = ratio_divide<_Period, __to_period>; + using __cr = typename common_type<__to_rep, _Rep, intmax_t>::type; + using __dc = __duration_cast_impl<_ToDur, __cf, __cr, + __cf::num == 1, __cf::den == 1>; + return __dc::__cast(__d); + } } /** Trait indicating whether to treat a type as a floating-point type. @@ -290,6 +308,19 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template inline constexpr bool treat_as_floating_point_v = treat_as_floating_point<_Rep>::value; + + template<> + inline constexpr bool treat_as_floating_point_v = false; + template<> + inline constexpr bool treat_as_floating_point_v = false; + template<> + inline constexpr bool treat_as_floating_point_v = false; + template<> + inline constexpr bool treat_as_floating_point_v = true; + template<> + inline constexpr bool treat_as_floating_point_v = true; + template<> + inline constexpr bool treat_as_floating_point_v = true; #endif // C++17 #if __cplusplus > 201703L @@ -632,8 +663,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // DR 934. template _GLIBCXX17_CONSTEXPR - typename enable_if::value, - duration&>::type + __enable_if_t::value, duration&> operator%=(const rep& __rhs) { __r %= __rhs; @@ -642,8 +672,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template _GLIBCXX17_CONSTEXPR - typename enable_if::value, - duration&>::type + __enable_if_t::value, duration&> operator%=(const duration& __d) { __r %= __d.count(); @@ -1019,7 +1048,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION */ template [[nodiscard]] constexpr - enable_if_t<__is_duration<_ToDur>::value, time_point<_Clock, _ToDur>> + enable_if_t<__is_duration_v<_ToDur>, time_point<_Clock, _ToDur>> floor(const time_point<_Clock, _Dur>& __tp) { return time_point<_Clock, _ToDur>{ @@ -1040,7 +1069,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION */ template [[nodiscard]] constexpr - enable_if_t<__is_duration<_ToDur>::value, time_point<_Clock, _ToDur>> + enable_if_t<__is_duration_v<_ToDur>, time_point<_Clock, _ToDur>> ceil(const time_point<_Clock, _Dur>& __tp) { return time_point<_Clock, _ToDur>{ @@ -1062,10 +1091,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION */ template [[nodiscard]] constexpr - enable_if_t< - __and_<__is_duration<_ToDur>, - __not_>>::value, - time_point<_Clock, _ToDur>> + enable_if_t<__is_duration_v<_ToDur> + && !treat_as_floating_point_v, + time_point<_Clock, _ToDur>> round(const time_point<_Clock, _Dur>& __tp) { return time_point<_Clock, _ToDur>{