git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

revert: stl_map.h (operator[](key_type&&)): Replace std::make_pair with value_type. 

2012-08-04  Paolo Carlini  <paolo.carlini@oracle.com>

	Revert:
	2012-08-03  Ollie Wild  <aaw@google.com>
		    Richard Smith  <richardsmith@google.com>

	* include/bits/stl_map.h (operator[](key_type&&)): Replace
	std::make_pair with value_type.
	* testsuite/23_containers/map/operators/2.cc: New test.

From-SVN: r190142
This commit is contained in:
Paolo Carlini 2012-08-04 11:44:28 +00:00 committed by Paolo Carlini
parent fc27f749af
commit 75235f0597
3 changed files with 11 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,13 @@
2012-08-04 Paolo Carlini <paolo.carlini@oracle.com>
Revert:
2012-08-03 Ollie Wild <aaw@google.com>
Richard Smith <richardsmith@google.com>
* include/bits/stl_map.h (operator[](key_type&&)): Replace
std::make_pair with value_type.
* testsuite/23_containers/map/operators/2.cc: New test.
2012-08-03 François Dumont <fdumont@gcc.gnu.org> 2012-08-03 François Dumont <fdumont@gcc.gnu.org>
* include/debug/functions.h (__check_partition_lower_aux): Remove * include/debug/functions.h (__check_partition_lower_aux): Remove

2
libstdc++-v3/include/bits/stl_map.h
View File

@ -475,7 +475,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
iterator __i = lower_bound(__k); iterator __i = lower_bound(__k);
// __i->first is greater than or equivalent to __k. // __i->first is greater than or equivalent to __k.
if (__i == end() || key_comp()(__k, (*__i).first)) if (__i == end() || key_comp()(__k, (*__i).first))
__i = insert(__i, value_type(std::move(__k), mapped_type())); __i = insert(__i, std::make_pair(std::move(__k), mapped_type()));
return (*__i).second; return (*__i).second;
} }
#endif #endif

38
libstdc++-v3/testsuite/23_containers/map/operators/2.cc
View File

@ -1,38 +0,0 @@
// Copyright (C) 2012
// 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/>.
// 23.4.4 template class map
// This test verifies that the value type of a map need not be default
// copyable.
// { dg-do compile }
// { dg-options "-std=gnu++11" }
#include <map>
struct Mapped {
Mapped();
explicit Mapped(const Mapped&);
};
Mapped & foo()
{
std::map<int, Mapped> m;
return m[0];
}