2010-06-10 Paolo Carlini <paolo.carlini@oracle.com>

	* include/std/tuple (tuple(const tuple&)): Define explicitly-defaulted.
	* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Tweak dg-warning
	line number.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@160539 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index f280f119d220c880b231fdbdabed0f4851507cd0..63826fc046204b1c6f1d06cf0710783e988c6501 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-10  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       * include/std/tuple (tuple(const tuple&)): Define explicitly-defaulted.
+       * testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Tweak dg-warning
+       line number.
+
 2010-06-10  Paolo Carlini  <paolo.carlini@oracle.com>
 
        PR libstdc++/44487

diff --git a/libstdc++-v3/include/std/tuple b/libstdc++-v3/include/std/tuple
index 027442ddd7169cb232f2d5ac1ce5079998a3410d..bc458f15ba47adb6aa8e7bd5318592fccc9e66d8 100644 (file)
--- a/libstdc++-v3/include/std/tuple
+++ b/libstdc++-v3/include/std/tuple
@@ -238,8 +238,7 @@ namespace std
         tuple(_UElements&&... __elements)
        : _Inherited(std::forward<_UElements>(__elements)...) { }
 
-      tuple(const tuple& __in)
-      : _Inherited(static_cast<const _Inherited&>(__in)) { }
+      tuple(const tuple&) = default;
 
       tuple(tuple&& __in)
       : _Inherited(static_cast<_Inherited&&>(__in)) { }
@@ -321,8 +320,7 @@ namespace std
         tuple(_U1&& __a1, _U2&& __a2)
        : _Inherited(std::forward<_U1>(__a1), std::forward<_U2>(__a2)) { }
 
-      tuple(const tuple& __in)
-      : _Inherited(static_cast<const _Inherited&>(__in)) { }
+      tuple(const tuple&) = default;
 
       tuple(tuple&& __in)
       : _Inherited(static_cast<_Inherited&&>(__in)) { }

diff --git a/libstdc++-v3/testsuite/20_util/weak_ptr/comparison/cmp_neg.cc b/libstdc++-v3/testsuite/20_util/weak_ptr/comparison/cmp_neg.cc
index 17d662accae3d0637a379c1726dac39486793d4b..db7907607c34554e8000c46f11f7247516b333a5 100644 (file)
--- a/libstdc++-v3/testsuite/20_util/weak_ptr/comparison/cmp_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/weak_ptr/comparison/cmp_neg.cc
@@ -44,7 +44,7 @@ main()
 // { dg-warning "note" "" { target *-*-* } 324 }
 // { dg-warning "note" "" { target *-*-* } 423 }
 // { dg-warning "note" "" { target *-*-* } 862 }
-// { dg-warning "note" "" { target *-*-* } 512 }
+// { dg-warning "note" "" { target *-*-* } 510 }
 // { dg-warning "note" "" { target *-*-* } 1005 }
 // { dg-warning "note" "" { target *-*-* } 340 }
 // { dg-warning "note" "" { target *-*-* } 290 }