C++17 GB50 resolution (P0505R0)
authorDinka Ranns <dinka.ranns@googlemail.com>
Sun, 19 Feb 2017 16:04:35 +0000 (16:04 +0000)
committerJonathan Wakely <redi@gcc.gnu.org>
Sun, 19 Feb 2017 16:04:35 +0000 (16:04 +0000)
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

libstdc++-v3/ChangeLog
libstdc++-v3/include/std/chrono
libstdc++-v3/testsuite/20_util/duration/arithmetic/constexpr_c++17.cc [new file with mode: 0644]
libstdc++-v3/testsuite/20_util/duration/literals/range.cc
libstdc++-v3/testsuite/20_util/time_point/arithmetic/constexpr.cc [new file with mode: 0644]

index 01efa3ed1a70881d74eaf529803587c0f083ea96..0b02dcac602dac9816374c75514f46c9b6d2468b 100644 (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.
index 2c33be0139c1da9a781585c66ec6bf362d2df04c..b3dc430b67acc11db71ea1eddcf287de87794a4e 100644 (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;
diff --git a/libstdc++-v3/testsuite/20_util/duration/arithmetic/constexpr_c++17.cc b/libstdc++-v3/testsuite/20_util/duration/arithmetic/constexpr_c++17.cc
new file mode 100644 (file)
index 0000000..2721765
--- /dev/null
@@ -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();
+
index eafc806ff517439197f8f63b78935ed2135c273f..c0d1a6e588560b849d768d8df77363fa720c9bbd 100644 (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
diff --git a/libstdc++-v3/testsuite/20_util/time_point/arithmetic/constexpr.cc b/libstdc++-v3/testsuite/20_util/time_point/arithmetic/constexpr.cc
new file mode 100644 (file)
index 0000000..2f2aceb
--- /dev/null
@@ -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();