From 62b547b5f6aa7b86cd6a29501fd0ed2c259e1f6d Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 6 Dec 2011 15:13:04 +0000 Subject: re PR libstdc++/51183 (pair piecewise_construct_t constructor copies) 2011-12-06 Jonathan Wakely Chris Jefferson PR libstdc++/51183 * include/std/stl_pair.h (pair<>::__cons, pair<>::__do_cons): Remove. (pair<>::pair(piecewise_construct_t, tuple<>, tuple<>): Only declare. (pair<>::pair(tuple<>&, tuple<>&, _Index_tuple<>, _Index_tuple<>)): Declare. * include/std/tuple (pair<>::__cons, pair<>::__do_cons): Remove. (pair<>::pair(tuple<>&, tuple<>&, _Index_tuple<>, _Index_tuple<>)): Define. (pair<>::pair(piecewise_construct_t, tuple<>, tuple<>): Define, delegating to the latter. * testsuite/20_util/pair/piecewise2.cc: New. Co-Authored-By: Chris Jefferson From-SVN: r182054 --- libstdc++-v3/ChangeLog | 15 ++++++ libstdc++-v3/include/bits/stl_pair.h | 18 +++---- libstdc++-v3/include/std/tuple | 31 +++++++----- libstdc++-v3/testsuite/20_util/pair/piecewise2.cc | 60 +++++++++++++++++++++++ 4 files changed, 99 insertions(+), 25 deletions(-) create mode 100644 libstdc++-v3/testsuite/20_util/pair/piecewise2.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ca01b90..b93cc65 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,18 @@ +2011-12-06 Jonathan Wakely + Chris Jefferson + + PR libstdc++/51183 + * include/std/stl_pair.h (pair<>::__cons, pair<>::__do_cons): Remove. + (pair<>::pair(piecewise_construct_t, tuple<>, tuple<>): Only declare. + (pair<>::pair(tuple<>&, tuple<>&, _Index_tuple<>, _Index_tuple<>)): + Declare. + * include/std/tuple (pair<>::__cons, pair<>::__do_cons): Remove. + (pair<>::pair(tuple<>&, tuple<>&, _Index_tuple<>, _Index_tuple<>)): + Define. + (pair<>::pair(piecewise_construct_t, tuple<>, tuple<>): Define, + delegating to the latter. + * testsuite/20_util/pair/piecewise2.cc: New. + 2011-12-05 Paolo Carlini * libsupc++/initializer_list: Do not declare anything if diff --git a/libstdc++-v3/include/bits/stl_pair.h b/libstdc++-v3/include/bits/stl_pair.h index bb33cc6..c1df571 100644 --- a/libstdc++-v3/include/bits/stl_pair.h +++ b/libstdc++-v3/include/bits/stl_pair.h @@ -149,11 +149,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION : first(std::forward<_U1>(__p.first)), second(std::forward<_U2>(__p.second)) { } - template - pair(piecewise_construct_t, - tuple<_Args1...> __first, tuple<_Args2...> __second) - : first(__cons(std::move(__first))), - second(__cons(std::move(__second))) { } + template + pair(piecewise_construct_t, tuple<_Args1...>, tuple<_Args2...>); pair& operator=(const pair& __p) @@ -202,13 +199,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } private: - template - static _Tp - __cons(tuple<_Args...>&&); - - template - static _Tp - __do_cons(tuple<_Args...>&&, const _Index_tuple<_Indexes...>&); + template + pair(tuple<_Args1...>&, tuple<_Args2...>&, + _Index_tuple<_Indexes1...>, _Index_tuple<_Indexes2...>); #endif }; diff --git a/libstdc++-v3/include/std/tuple b/libstdc++-v3/include/std/tuple index 282d450..e8aaf46 100644 --- a/libstdc++-v3/include/std/tuple +++ b/libstdc++-v3/include/std/tuple @@ -1057,21 +1057,26 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // See stl_pair.h... template - template - inline _Tp - pair<_T1, _T2>::__cons(tuple<_Args...>&& __tuple) - { - typedef typename _Build_index_tuple::__type - _Indexes; - return __do_cons<_Tp>(std::move(__tuple), _Indexes()); - } + template + inline + pair<_T1, _T2>:: + pair(piecewise_construct_t, + tuple<_Args1...> __first, tuple<_Args2...> __second) + : pair(__first, __second, + typename _Build_index_tuple::__type(), + typename _Build_index_tuple::__type()) + { } template - template - inline _Tp - pair<_T1, _T2>::__do_cons(tuple<_Args...>&& __tuple, - const _Index_tuple<_Indexes...>&) - { return _Tp(std::forward<_Args>(get<_Indexes>(__tuple))...); } + template + inline + pair<_T1, _T2>:: + pair(tuple<_Args1...>& __tuple1, tuple<_Args2...>& __tuple2, + _Index_tuple<_Indexes1...>, _Index_tuple<_Indexes2...>) + : first(std::forward<_Args1>(std::get<_Indexes1>(__tuple1))...), + second(std::forward<_Args2>(std::get<_Indexes2>(__tuple2))...) + { } _GLIBCXX_END_NAMESPACE_VERSION } // namespace diff --git a/libstdc++-v3/testsuite/20_util/pair/piecewise2.cc b/libstdc++-v3/testsuite/20_util/pair/piecewise2.cc new file mode 100644 index 0000000..695a3c9 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/pair/piecewise2.cc @@ -0,0 +1,60 @@ +// { dg-do compile } +// { dg-options "-std=gnu++0x" } + +// Copyright (C) 2011 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 +// 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 + +struct NoCon +{ + NoCon() = delete; + NoCon(const NoCon&) = delete; +}; + +struct RefCheck1 +{ + RefCheck1(NoCon&, NoCon&&) { } + RefCheck1() = delete; + RefCheck1(const RefCheck1&) = delete; +}; + +struct RefCheck2 +{ + RefCheck2(const NoCon&, const NoCon&&, NoCon&) { } + RefCheck2() = delete; + RefCheck2(const RefCheck2&) = delete; +}; + +struct Default +{ + Default(); + Default(const Default&) = delete; +}; + +// libstdc++/51183 +void test01(std::tuple t1, + std::tuple t2) +{ + std::pair(std::piecewise_construct, t1, t2); +} + +void test02(std::tuple<> t1, std::tuple t2) +{ + std::pair A(std::piecewise_construct, t1, t2); +} -- cgit v1.1