diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2010-06-10 12:24:31 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2010-06-10 12:24:31 +0000 |
| commit | d247d6625a001979ba41d51d73cb3311e362c9c2 (patch) | |
| tree | 6fc025711f46465bebca75f0dc679a685c871743 | |
| parent | bfa912a87bce04f4e79422ed623c6a7ec0f1c416 (diff) | |
| download | gcc-d247d6625a001979ba41d51d73cb3311e362c9c2.zip gcc-d247d6625a001979ba41d51d73cb3311e362c9c2.tar.gz gcc-d247d6625a001979ba41d51d73cb3311e362c9c2.tar.bz2 | |
tuple (tuple(const tuple&)): Define explicitly-defaulted.
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.
From-SVN: r160539
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/tuple | 6 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/20_util/weak_ptr/comparison/cmp_neg.cc | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f280f11..63826fc 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,11 @@ 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 * include/bits/stl_pair.h (pair(pair&&)): Remove. (pair(pair<_U1, _U2>&&): Use forward, consistently with Bullet 5 diff --git a/libstdc++-v3/include/std/tuple b/libstdc++-v3/include/std/tuple index 027442d..bc458f1 100644 --- 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 17d662a..db79076 100644 --- 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 } |