From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 2AE1F38A817F; Fri, 9 Dec 2022 00:35:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2AE1F38A817F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1670546130; bh=MFQN+ENYtLir4CNTmwdDoap5gX0ynbdZrK9JBtcJTwg=; h=From:To:Subject:Date:From; b=AOtywS6pwi/j8IcCb4lPh9LlUcLU2oO5yVQhbGfEDchmIMACgjV72OHImA360xMGf d12HOeGMhEAsKdjoQdKk+5SuYrn9VYOGL5+XOXmJBRRxbKq1ieQG4+qsv5b3VWdLwB i+Mfrrar5aoRHSJ6pusyPxfeWLzKTUnSupZvmMdg= 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-4571] libstdc++: Change class-key for duration and time_point to class X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: e6110da479951b759a12c5618f5304187b650326 X-Git-Newrev: 7eec3114ebe8d4c55c64b4e47546d3d8f95eb09b Message-Id: <20221209003530.2AE1F38A817F@sourceware.org> Date: Fri, 9 Dec 2022 00:35:30 +0000 (GMT) List-Id: https://gcc.gnu.org/g:7eec3114ebe8d4c55c64b4e47546d3d8f95eb09b commit r13-4571-g7eec3114ebe8d4c55c64b4e47546d3d8f95eb09b Author: Jonathan Wakely Date: Fri Dec 2 16:18:43 2022 +0000 libstdc++: Change class-key for duration and time_point to class We define these with the 'struct' keyword, but the standard uses 'class'. This results in warnings if users try to refer to them using elaborated type specifiers. libstdc++-v3/ChangeLog: * include/bits/chrono.h (duration, time_point): Change 'struct' to 'class'. Diff: --- libstdc++-v3/include/bits/chrono.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libstdc++-v3/include/bits/chrono.h b/libstdc++-v3/include/bits/chrono.h index cabf61264d8..496e9485a73 100644 --- a/libstdc++-v3/include/bits/chrono.h +++ b/libstdc++-v3/include/bits/chrono.h @@ -59,11 +59,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /// `chrono::duration` represents a distance between two points in time template> - struct duration; + class duration; /// `chrono::time_point` represents a point in time as measured by a clock template - struct time_point; + class time_point; /// @} } @@ -431,14 +431,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /// @endcond template - struct duration + class duration { static_assert(!__is_duration<_Rep>::value, "rep cannot be a duration"); static_assert(__is_ratio<_Period>::value, "period must be a specialization of ratio"); static_assert(_Period::num > 0, "period must be positive"); - private: template using __is_float = treat_as_floating_point<_Rep2>; @@ -844,11 +843,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #undef _GLIBCXX_CHRONO_INT64_T template - struct time_point + class time_point { static_assert(__is_duration<_Dur>::value, "duration must be a specialization of std::chrono::duration"); + public: typedef _Clock clock; typedef _Dur duration; typedef typename duration::rep rep;