OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

C++17 GB50 resolution (P0505R0)

Browse Source 
2017-02-19  Dinka Ranns  <dinka.ranns@googlemail.com>

	C++17 GB50 resolution
	* include/std/chrono (duration::operator++()): Add
	_GLIBCXX17_CONSTEXPR.
	(duration::operator++(int)): Likewise.
	(duration::operator--()): Likewise.
	(duration::operator--(int)): Likewise.
	(duration::operator+=(const duration&)): Likewise.
	(duration::operator-=(const duration&)): Likewise.
	(duration::operator*=(const rep&)): Likewise.
	(duration::operator/=(const rep&)): Likewise.
	(duration::operator%=(const rep&)): Likewise.
	(duration::operator%=(const duration&)): Likewise.
	(time_point::operator+=(const duration&)): Likewise.
	(time_point::operator-=(const duration&)): Likewise.
	* testsuite/20_util/duration/arithmetic/constexpr_c++17.cc: New test.
	* testsuite/20_util/duration/literals/range.cc: Adjust dg-error.
	* testsuite/20_util/time_point/arithmetic/constexpr.cc: New test.

From-SVN: r245575
This commit is contained in:
Dinka Ranns 2017-02-19 16:04:35 +00:00 committed by Jonathan Wakely
parent 7dfa657b5b
commit 1dee318ad8
5 changed files with 114 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,23 @@
2017-02-19 Dinka Ranns <dinka.ranns@googlemail.com>
C++17 GB50 resolution
* include/std/chrono (duration::operator++()): Add
_GLIBCXX17_CONSTEXPR.
(duration::operator++(int)): Likewise.
(duration::operator--()): Likewise.
(duration::operator--(int)): Likewise.
(duration::operator+=(const duration&)): Likewise.
(duration::operator-=(const duration&)): Likewise.
(duration::operator*=(const rep&)): Likewise.
(duration::operator/=(const rep&)): Likewise.
(duration::operator%=(const rep&)): Likewise.
(duration::operator%=(const duration&)): Likewise.
(time_point::operator+=(const duration&)): Likewise.
(time_point::operator-=(const duration&)): Likewise.
* testsuite/20_util/duration/arithmetic/constexpr_c++17.cc: New test.
* testsuite/20_util/duration/literals/range.cc: Adjust dg-error.
* testsuite/20_util/time_point/arithmetic/constexpr.cc: New test.
2017-02-19 Gerald Pfeifer <gerald@pfeifer.com>
* doc/xml/manual/debug.xml: Adjust link to ThreadSanitizer.

22
libstdc++-v3/include/std/chrono
View File

@ -349,50 +349,50 @@ _GLIBCXX_END_NAMESPACE_VERSION
operator-() const
{ return duration(-__r); }
duration&
_GLIBCXX17_CONSTEXPR duration&
operator++()
{
++__r;
return *this;
}
duration
_GLIBCXX17_CONSTEXPR duration
operator++(int)
{ return duration(__r++); }
duration&
_GLIBCXX17_CONSTEXPR duration&
operator--()
{
--__r;
return *this;
}
duration
_GLIBCXX17_CONSTEXPR duration
operator--(int)
{ return duration(__r--); }
duration&
_GLIBCXX17_CONSTEXPR duration&
operator+=(const duration& __d)
{
__r += __d.count();
return *this;
}
duration&
_GLIBCXX17_CONSTEXPR duration&
operator-=(const duration& __d)
{
__r -= __d.count();
return *this;
}
duration&
_GLIBCXX17_CONSTEXPR duration&
operator*=(const rep& __rhs)
{
__r *= __rhs;
return *this;
}
duration&
_GLIBCXX17_CONSTEXPR duration&
operator/=(const rep& __rhs)
{
__r /= __rhs;
@ -401,6 +401,7 @@ _GLIBCXX_END_NAMESPACE_VERSION
// DR 934.
template<typename _Rep2 = rep>
_GLIBCXX17_CONSTEXPR
typename enable_if<!treat_as_floating_point<_Rep2>::value,
duration&>::type
operator%=(const rep& __rhs)
@ -410,6 +411,7 @@ _GLIBCXX_END_NAMESPACE_VERSION
}
template<typename _Rep2 = rep>
_GLIBCXX17_CONSTEXPR
typename enable_if<!treat_as_floating_point<_Rep2>::value,
duration&>::type
operator%=(const duration& __d)
@ -631,14 +633,14 @@ _GLIBCXX_END_NAMESPACE_VERSION
{ return __d; }
// arithmetic
time_point&
_GLIBCXX17_CONSTEXPR time_point&
operator+=(const duration& __dur)
{
__d += __dur;
return *this;
}
time_point&
_GLIBCXX17_CONSTEXPR time_point&
operator-=(const duration& __dur)
{
__d -= __dur;

45
libstdc++-v3/testsuite/20_util/duration/arithmetic/constexpr_c++17.cc Normal file
View File

@ -0,0 +1,45 @@
// { dg-options "-std=gnu++17" }
// { dg-do compile { target c++1z } }
// Copyright (C) 2011-2017 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
// terms of the GNU General Public License as published by the
// Free Software Foundation; either version 3, or (at your option)
// any later version.
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License along
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
#include <chrono>
#include <testsuite_common_types.h>
constexpr auto test_operators()
{
std::chrono::nanoseconds d1 { 1 };
d1++;
++d1;
d1--;
--d1;
auto d2(d1);
d1+=d2;
d1-=d2;
d1*=1;
d1/=1;
d1%=1;
d1%=d2;
return d1;
}
constexpr auto d4 = test_operators();

2
libstdc++-v3/testsuite/20_util/duration/literals/range.cc
View File

@ -26,6 +26,6 @@ test01()
// std::numeric_limits<int64_t>::max() == 9223372036854775807;
auto h = 9223372036854775808h;
// { dg-error "cannot be represented" "" { target *-*-* } 890 }
// { dg-error "cannot be represented" "" { target *-*-* } 892 }
}
// { dg-prune-output "in constexpr expansion" } // needed for -O0

36
libstdc++-v3/testsuite/20_util/time_point/arithmetic/constexpr.cc Normal file
View File

@ -0,0 +1,36 @@
// { dg-options "-std=gnu++17" }
// { dg-do compile { target c++1z } }
// Copyright (C) 2011-2016 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
// terms of the GNU General Public License as published by the
// Free Software Foundation; either version 3, or (at your option)
// any later version.
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License along
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
#include <chrono>
#include <testsuite_common_types.h>
constexpr auto test_operators()
{
using namespace std::chrono;
nanoseconds d1 { };
time_point<system_clock> c1 { };
c1+=d1;
c1-=d1;
return 11;
}
constexpr auto a = test_operators();