diff options
author | Paolo Carlini <paolo.carlini@oracle.com> | 2013-06-14 23:38:33 +0000 |
---|---|---|
committer | Paolo Carlini <paolo.carlini@oracle.com> | 2013-06-14 23:38:33 +0000 |
commit | 58e8a9d8ab131b3f5a50ab270e968f103c749ba2 (patch) | |
tree | 0b41700927017592ba0b499a98413aa87197f5dc | |
parent | ecd389bbf4edd0ecf74c6d2f1e6892ccc855c44b (diff) |
2013-06-15 Paolo Carlini <paolo.carlini@oracle.com>
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.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gcc-4_8-branch@200112 138bc75d-0d04-0410-961f-82ee72b054a4
4 files changed, 114 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index a4c0bca9d43..5317e1a87b7 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2013-06-15 Paolo Carlini <paolo.carlini@oracle.com> + + 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-12 Benjamin Kosnik <bkoz@redhat.com> * include/bits/c++config (_GLIBCXX_ABI_TAG_CXX11): Add. diff --git a/libstdc++-v3/include/bits/unordered_map.h b/libstdc++-v3/include/bits/unordered_map.h index be213e04a79..ed85e2771f0 100644 --- a/libstdc++-v3/include/bits/unordered_map.h +++ b/libstdc++-v3/include/bits/unordered_map.h @@ -367,7 +367,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER _Pair&&>::value>::type> std::pair<iterator, bool> insert(_Pair&& __x) - { return _M_h.insert(std::move(__x)); } + { return _M_h.insert(std::forward<_Pair>(__x)); } //@} //@{ @@ -401,7 +401,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)); } //@} /** @@ -1032,7 +1032,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)); } //@} //@{ @@ -1064,7 +1064,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 +// <http://www.gnu.org/licenses/>. + +#include <unordered_map> +#include <string> +#include <testsuite_hooks.h> + +void test01() +{ + bool test __attribute__((unused)) = true; + + { + std::unordered_map<std::string, std::string> mymap; + std::pair<std::string, std::string> mypair{std::string("key"), + std::string("value")}; + mymap.insert(mypair); + + VERIFY( mypair.first.length() && mypair.second.length() ); + } + + { + std::unordered_map<std::string, std::string> mymap; + std::pair<std::string, std::string> 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 +// <http://www.gnu.org/licenses/>. + +#include <unordered_map> +#include <string> +#include <testsuite_hooks.h> + +void test01() +{ + bool test __attribute__((unused)) = true; + + { + std::unordered_multimap<std::string, std::string> mymmap; + std::pair<std::string, std::string> mypair{std::string("key"), + std::string("value")}; + mymmap.insert(mypair); + + VERIFY( mypair.first.length() && mypair.second.length() ); + } + + { + std::unordered_multimap<std::string, std::string> mymmap; + std::pair<std::string, std::string> mypair{std::string("key"), + std::string("value")}; + mymmap.insert(mymmap.begin(), mypair); + + VERIFY( mypair.first.length() && mypair.second.length() ); + } +} + +int main() +{ + test01(); + return 0; +} |