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

re PR libstdc++/57010 ([c++0x] priority_queue<>::pop() calls self-move-assignment operator) 

2013-04-22  Paolo Carlini  <paolo.carlini@oracle.com>

	PR libstdc++/57010
	* include/bits/stl_heap.h (pop_heap): Avoid self move-assignment.
	* testsuite/25_algorithms/pop_heap/57010.cc: New.

From-SVN: r198125
This commit is contained in:
Paolo Carlini 2013-04-22 10:07:31 +00:00 committed by Paolo Carlini
parent 0fad3dbc21
commit 177d2b74b5
3 changed files with 71 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,9 @@
2013-04-22 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/57010
* include/bits/stl_heap.h (pop_heap): Avoid self move-assignment.
* testsuite/25_algorithms/pop_heap/57010.cc: New.
2013-04-21 Evgeniy Stepanov <eugenis@google.com>
* src/c++11/system_error.cc (generic_category_instance): Add

14
libstdc++-v3/include/bits/stl_heap.h
View File

@ -291,8 +291,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__glibcxx_requires_valid_range(__first, __last);
__glibcxx_requires_heap(__first, __last);
--__last;
std::__pop_heap(__first, __last, __last);
if (__last - __first > 1)
{
--__last;
std::__pop_heap(__first, __last, __last);
}
}
template<typename _RandomAccessIterator, typename _Distance,
@ -363,8 +366,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__glibcxx_requires_non_empty_range(__first, __last);
__glibcxx_requires_heap_pred(__first, __last, __comp);
--__last;
std::__pop_heap(__first, __last, __last, __comp);
if (__last - __first > 1)
{
--__last;
std::__pop_heap(__first, __last, __last, __comp);
}
}
/**

55
libstdc++-v3/testsuite/25_algorithms/pop_heap/57010.cc Normal file
View File

@ -0,0 +1,55 @@
// 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/>.
// { dg-options "-std=gnu++11" }
#include <algorithm>
#include <functional>
#include <testsuite_hooks.h>
#include <testsuite_iterators.h>
#include <testsuite_rvalref.h>
using __gnu_test::test_container;
using __gnu_test::random_access_iterator_wrapper;
using __gnu_test::rvalstruct;
typedef test_container<rvalstruct, random_access_iterator_wrapper> container;
void test01()
{
{
rvalstruct makeheap[1];
container makecon(makeheap, makeheap + 1);
std::push_heap(makecon.begin(), makecon.end());
std::pop_heap(makecon.begin(), makecon.end());
}
{
rvalstruct makeheap[1];
container makecon(makeheap, makeheap + 1);
std::push_heap(makecon.begin(), makecon.end(), std::less<rvalstruct>());
std::pop_heap(makecon.begin(), makecon.end(), std::less<rvalstruct>());
}
}
int main()
{
test01();
return 0;
}