Patchwork [v3] libstdc++/54025

login
register
mail settings
Submitter Paolo Carlini
Date July 20, 2012, 9:50 a.m.
Message ID <500929F1.9000605@oracle.com>
Download mbox | patch
Permalink /patch/172190/
State New
Headers show

Comments

Paolo Carlini - July 20, 2012, 9:50 a.m.
Hi,

tested x86_64-linux, committed (see audit trail for details)

Thanks,
Paolo.

/////////////////////////
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.

Patch

Index: include/std/chrono
===================================================================
--- include/std/chrono	(revision 189648)
+++ include/std/chrono	(working copy)
@@ -228,7 +228,7 @@ 
 	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;
 
Index: testsuite/20_util/duration/cons/54025.cc
===================================================================
--- testsuite/20_util/duration/cons/54025.cc	(revision 0)
+++ testsuite/20_util/duration/cons/54025.cc	(revision 0)
@@ -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;
Index: testsuite/20_util/duration/cons/constexpr.cc
===================================================================
--- testsuite/20_util/duration/cons/constexpr.cc	(revision 189648)
+++ testsuite/20_util/duration/cons/constexpr.cc	(working copy)
@@ -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>();