git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR libstdc++/54025 (atomic<chrono::duration> won't compile: chrono::duration::duration() is not C++11 compliant) 

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.

Co-Authored-By: Jonathan Wakely <jwakely.gcc@gmail.com>

From-SVN: r189711
This commit is contained in:
Chip Salzenberg 2012-07-20 09:48:57 +00:00 committed by Paolo Carlini
parent d1870ff1bc
commit d069a690ee
4 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View File

@ -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> 2012-07-20 Paolo Carlini <paolo.carlini@oracle.com>
* testsuite/30_threads/thread/adl.cc: Add missing dg-requires. * testsuite/30_threads/thread/adl.cc: Add missing dg-requires.

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

@ -228,7 +228,7 @@ _GLIBCXX_END_NAMESPACE_VERSION
static_assert(_Period::num > 0, "period must be positive"); static_assert(_Period::num > 0, "period must be positive");
// 20.8.3.1 construction / copy / destroy // 20.8.3.1 construction / copy / destroy
constexpr duration() : __r() { } constexpr duration() = default;
constexpr duration(const duration&) = default; constexpr duration(const duration&) = default;

25
libstdc++-v3/testsuite/20_util/duration/cons/54025.cc Normal file
View File

@ -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;

9
libstdc++-v3/testsuite/20_util/duration/cons/constexpr.cc
View File

@ -1,7 +1,7 @@
// { dg-do compile } // { dg-do compile }
// { dg-options "-std=gnu++0x" } // { 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 // 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 // software; you can redistribute it and/or modify it under the
@ -24,7 +24,12 @@
int main() int main()
{ {
__gnu_test::constexpr_default_constructible test1; __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; __gnu_test::constexpr_single_value_constructible test2;
test2.operator()<std::chrono::seconds, std::chrono::seconds>(); test2.operator()<std::chrono::seconds, std::chrono::seconds>();