From d069a690ee1c1d9f774630bfc034ffcf33ba6c57 Mon Sep 17 00:00:00 2001 From: Chip Salzenberg Date: Fri, 20 Jul 2012 09:48:57 +0000 Subject: [PATCH] re PR libstdc++/54025 (atomic won't compile: chrono::duration::duration() is not C++11 compliant) 2012-07-20 Chip Salzenberg Jonathan Wakely 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. Co-Authored-By: Jonathan Wakely From-SVN: r189711 --- libstdc++-v3/ChangeLog | 8 ++++++ libstdc++-v3/include/std/chrono | 2 +- .../testsuite/20_util/duration/cons/54025.cc | 25 +++++++++++++++++++ .../20_util/duration/cons/constexpr.cc | 9 +++++-- 4 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 libstdc++-v3/testsuite/20_util/duration/cons/54025.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index a6eaa2f130d8..7c78a82af6b2 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2012-07-20 Chip Salzenberg + Jonathan Wakely + + 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 * 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 1931057d4cae..9ff8846587be 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 000000000000..3614594da66c --- /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 +// . + +#include +#include + +std::atomic> dur; diff --git a/libstdc++-v3/testsuite/20_util/duration/cons/constexpr.cc b/libstdc++-v3/testsuite/20_util/duration/cons/constexpr.cc index ca7716f632e5..8f063eacd943 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()(); + struct Seconds + { + constexpr Seconds() = default; + std::chrono::seconds s{}; + }; + test1.operator()>(); __gnu_test::constexpr_single_value_constructible test2; test2.operator()(); -- 2.39.5