diff options
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 8 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/chrono | 2 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/20_util/duration/cons/54025.cc | 25 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/20_util/duration/cons/constexpr.cc | 9 |
4 files changed, 41 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index a6eaa2f..7c78a82 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2012-07-20 Chip Salzenberg <chip@pobox.com> + Jonathan Wakely <jwakely.gcc@gmail.com> + + PR libstdc++/54025 + * include/std/chrono (duration<>::duration): Fix per C++11. + * testsuite/20_util/duration/cons/54025.cc: New. + * testsuite/20_util/duration/cons/constexpr.cc: Adjust. + 2012-07-20 Paolo Carlini <paolo.carlini@oracle.com> * testsuite/30_threads/thread/adl.cc: Add missing dg-requires. diff --git a/libstdc++-v3/include/std/chrono b/libstdc++-v3/include/std/chrono index 1931057..9ff8846 100644 --- a/libstdc++-v3/include/std/chrono +++ b/libstdc++-v3/include/std/chrono @@ -228,7 +228,7 @@ _GLIBCXX_END_NAMESPACE_VERSION static_assert(_Period::num > 0, "period must be positive"); // 20.8.3.1 construction / copy / destroy - constexpr duration() : __r() { } + constexpr duration() = default; constexpr duration(const duration&) = default; diff --git a/libstdc++-v3/testsuite/20_util/duration/cons/54025.cc b/libstdc++-v3/testsuite/20_util/duration/cons/54025.cc new file mode 100644 index 0000000..3614594 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/duration/cons/54025.cc @@ -0,0 +1,25 @@ +// { dg-do compile } +// { dg-options "-std=gnu++11" } +// { dg-require-cstdint "" } + +// Copyright (C) 2012 Free Software Foundation +// +// 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 <atomic> +#include <chrono> + +std::atomic<std::chrono::duration<long, std::micro>> dur; diff --git a/libstdc++-v3/testsuite/20_util/duration/cons/constexpr.cc b/libstdc++-v3/testsuite/20_util/duration/cons/constexpr.cc index ca7716f..8f063ea 100644 --- a/libstdc++-v3/testsuite/20_util/duration/cons/constexpr.cc +++ b/libstdc++-v3/testsuite/20_util/duration/cons/constexpr.cc @@ -1,7 +1,7 @@ // { dg-do compile } // { dg-options "-std=gnu++0x" } -// Copyright (C) 2010 Free Software Foundation, Inc. +// Copyright (C) 2010, 2011, 2012 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 @@ -24,7 +24,12 @@ int main() { __gnu_test::constexpr_default_constructible test1; - test1.operator()<std::chrono::seconds>(); + struct Seconds + { + constexpr Seconds() = default; + std::chrono::seconds s{}; + }; + test1.operator()<std::chrono::duration<Seconds>>(); __gnu_test::constexpr_single_value_constructible test2; test2.operator()<std::chrono::seconds, std::chrono::seconds>(); |