procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR libstdc++/61023 (set/map move assignment doesn't move (or copy) the comparator)

Browse source 
PR libstdc++/61023
	* include/bits/stl_tree.h (_Rb_tree::_M_move_assign): Copy the
	comparison function.
	* testsuite/23_containers/set/cons/61023.cc: New.

From-SVN: r210159
This commit is contained in:
Jonathan Wakely 2014-05-07 15:12:37 +01:00 • committed by Jonathan Wakely
parent e7b7077e4c
commit 2588652e17
3 changed files with 64 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libstdc++-v3/ChangeLog
View file

@ -1,3 +1,10 @@
2014-05-07 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/61023
* include/bits/stl_tree.h (_Rb_tree::_M_move_assign): Copy the
comparison function.
* testsuite/23_containers/set/cons/61023.cc: New.
2014-05-06 Paolo Carlini <paolo.carlini@oracle.com>
* include/Makefile.in: Regenerate.

1
libstdc++-v3/include/bits/stl_tree.h
View file

@ -1073,6 +1073,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
_M_move_assign(_Rb_tree& __x)
{
_M_impl._M_key_compare = __x._M_impl._M_key_compare;
if (_Alloc_traits::_S_propagate_on_move_assign()
|| _Alloc_traits::_S_always_equal()
|| _M_get_Node_allocator() == __x._M_get_Node_allocator())

56
libstdc++-v3/testsuite/23_containers/set/cons/61023.cc Normal file
View file

@ -0,0 +1,56 @@
// { dg-options "-std=gnu++11" }
// Copyright (C) 2014 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 <set>
#include <stdexcept>
struct Comparator
{
Comparator() : valid(false) { }
explicit Comparator(bool) : valid(true) { }
bool operator()(int i, int j) const
{
if (!valid)
throw std::logic_error("Comparator is invalid");
return i < j;
}
private:
bool valid;
};
int main()
{
using test_type = std::set<int, Comparator>;
Comparator cmp{true};
test_type good{cmp};
test_type s1;
s1 = good; // copy-assign
s1.insert(1);
s1.insert(2);
test_type s2;
s2 = std::move(good); // move-assign
s2.insert(1);
s2.insert(2);
}