OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR libstdc++/57619 (std::unordered_map and std::unordered_multimap::insert invoking std::pair move constructor) 

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.

From-SVN: r200111
This commit is contained in:
Paolo Carlini 2013-06-14 23:35:56 +00:00 committed by Paolo Carlini
parent 929f647a01
commit 95777cb0fb
4 changed files with 114 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View File

@ -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-14 Alan Modra <amodra@gmail.com>
* configure.host (abi_baseline_pair): Match powerpc64*.

8
libstdc++-v3/include/bits/unordered_map.h
View File

@ -397,7 +397,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)); }
//@}
//@{
@ -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)); }
//@}
/**

51
libstdc++-v3/testsuite/23_containers/unordered_map/insert/57619.C Normal file
View File

@ -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;
}

51
libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/57619.C Normal file
View File

@ -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;
}