From: Paolo Carlini Date: Fri, 14 Jun 2013 23:35:56 +0000 (+0000) Subject: re PR libstdc++/57619 (std::unordered_map and std::unordered_multimap::insert invokin... X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=95777cb0fb2f1baf68ac2c4ee00ff917eba504a4;p=gcc.git re PR libstdc++/57619 (std::unordered_map and std::unordered_multimap::insert invoking std::pair move constructor) 2013-06-15 Paolo Carlini PR libstdc++/57619 * include/bits/unordered_map.h (unordered_map<>::insert, unordered_multimap<>::insert): Use std::forward, not std::move. * testsuite/23_containers/unordered_map/insert/57619.C: New. * testsuite/23_containers/unordered_multimap/insert/57619.C: Likewise. From-SVN: r200111 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 371c6d57ef5..df721ee9bbd 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2013-06-15 Paolo Carlini + + PR libstdc++/57619 + * include/bits/unordered_map.h (unordered_map<>::insert, + unordered_multimap<>::insert): Use std::forward, not std::move. + * testsuite/23_containers/unordered_map/insert/57619.C: New. + * testsuite/23_containers/unordered_multimap/insert/57619.C: Likewise. + 2013-06-14 Alan Modra * configure.host (abi_baseline_pair): Match powerpc64*. diff --git a/libstdc++-v3/include/bits/unordered_map.h b/libstdc++-v3/include/bits/unordered_map.h index 22a5166cc3c..6d5b29e09d2 100644 --- a/libstdc++-v3/include/bits/unordered_map.h +++ b/libstdc++-v3/include/bits/unordered_map.h @@ -397,7 +397,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER _Pair&&>::value>::type> std::pair insert(_Pair&& __x) - { return _M_h.insert(std::move(__x)); } + { return _M_h.insert(std::forward<_Pair>(__x)); } //@} //@{ @@ -431,7 +431,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER _Pair&&>::value>::type> iterator insert(const_iterator __hint, _Pair&& __x) - { return _M_h.insert(__hint, std::move(__x)); } + { return _M_h.insert(__hint, std::forward<_Pair>(__x)); } //@} /** @@ -1093,7 +1093,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER _Pair&&>::value>::type> iterator insert(_Pair&& __x) - { return _M_h.insert(std::move(__x)); } + { return _M_h.insert(std::forward<_Pair>(__x)); } //@} //@{ @@ -1125,7 +1125,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER _Pair&&>::value>::type> iterator insert(const_iterator __hint, _Pair&& __x) - { return _M_h.insert(__hint, std::move(__x)); } + { return _M_h.insert(__hint, std::forward<_Pair>(__x)); } //@} /** diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/insert/57619.C b/libstdc++-v3/testsuite/23_containers/unordered_map/insert/57619.C new file mode 100644 index 00000000000..aa11e5ccd51 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/unordered_map/insert/57619.C @@ -0,0 +1,51 @@ +// { dg-options "-std=gnu++11" } +// +// Copyright (C) 2013 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 +#include + +void test01() +{ + bool test __attribute__((unused)) = true; + + { + std::unordered_map mymap; + std::pair mypair{std::string("key"), + std::string("value")}; + mymap.insert(mypair); + + VERIFY( mypair.first.length() && mypair.second.length() ); + } + + { + std::unordered_map mymap; + std::pair mypair{std::string("key"), + std::string("value")}; + mymap.insert(mymap.begin(), mypair); + + VERIFY( mypair.first.length() && mypair.second.length() ); + } +} + +int main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/57619.C b/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/57619.C new file mode 100644 index 00000000000..8a44eb91c95 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/57619.C @@ -0,0 +1,51 @@ +// { dg-options "-std=gnu++11" } +// +// Copyright (C) 2013 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 +#include + +void test01() +{ + bool test __attribute__((unused)) = true; + + { + std::unordered_multimap mymmap; + std::pair mypair{std::string("key"), + std::string("value")}; + mymmap.insert(mypair); + + VERIFY( mypair.first.length() && mypair.second.length() ); + } + + { + std::unordered_multimap mymmap; + std::pair mypair{std::string("key"), + std::string("value")}; + mymmap.insert(mymmap.begin(), mypair); + + VERIFY( mypair.first.length() && mypair.second.length() ); + } +} + +int main() +{ + test01(); + return 0; +}