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

PR 70101 fix allocator-extended ctors for std::priority_queue 

PR libstdc++/70101
	* include/bits/stl_queue.h (priority_queue): Fix allocator-extended
	constructors.
	* testsuite/23_containers/priority_queue/allocator.cc: New test.

From-SVN: r240781
This commit is contained in:
Jonathan Wakely 2016-10-05 13:01:57 +01:00 committed by Jonathan Wakely
parent a2a64b499a
commit 92805612f4
3 changed files with 73 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View File

@ -1,5 +1,10 @@
2016-10-05 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/70101
* include/bits/stl_queue.h (priority_queue): Fix allocator-extended
constructors.
* testsuite/23_containers/priority_queue/allocator.cc: New test.
PR libstdc++/77864
* include/bits/stl_map.h (map::map()): Use nothrow constructibility
of comparison function in conditional noexcept.

12
libstdc++-v3/include/bits/stl_queue.h
View File

@ -462,28 +462,28 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Alloc, typename _Requires = _Uses<_Alloc>>
explicit
priority_queue(const _Alloc& __a)
: c(__a) { }
: c(__a), comp() { }
template<typename _Alloc, typename _Requires = _Uses<_Alloc>>
priority_queue(const _Compare& __x, const _Alloc& __a)
: c(__x, __a) { }
: c(__a), comp(__x) { }
template<typename _Alloc, typename _Requires = _Uses<_Alloc>>
priority_queue(const _Compare& __x, const _Sequence& __c,
const _Alloc& __a)
: c(__x, __c, __a) { }
: c(__c, __a), comp(__x) { }
template<typename _Alloc, typename _Requires = _Uses<_Alloc>>
priority_queue(const _Compare& __x, _Sequence&& __c, const _Alloc& __a)
: c(__x, std::move(__c), __a) { }
: c(std::move(__c), __a), comp(__x) { }
template<typename _Alloc, typename _Requires = _Uses<_Alloc>>
priority_queue(const priority_queue& __q, const _Alloc& __a)
: c(__q.c, __a) { }
: c(__q.c, __a), comp(__q.comp) { }
template<typename _Alloc, typename _Requires = _Uses<_Alloc>>
priority_queue(priority_queue&& __q, const _Alloc& __a)
: c(std::move(__q.c), __a) { }
: c(std::move(__q.c), __a), comp(std::move(__q.comp)) { }
#endif
/**

62
libstdc++-v3/testsuite/23_containers/priority_queue/allocator.cc Normal file
View File

@ -0,0 +1,62 @@
// Copyright (C) 2016 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-do run { target c++11 } }
#include <queue>
#include <testsuite_hooks.h>
// PR libstdc++/70101
struct comp
{
int init_check[64];
bool operator()(int l, int r) const { return l < r; }
};
struct check_init : std::priority_queue<int, std::vector<int>, comp>
{
template<typename... Args>
check_init(Args... args) : priority_queue(args...)
{
push(0);
for (int i : comp.init_check)
VERIFY( i == 0 ); // Will not fail if *this was value-initialized.
}
};
void
test01()
{
std::vector<int> vec;
comp cmp{};
std::allocator<int> alloc;
std::priority_queue<int, std::vector<int>, comp> pq;
check_init c1( pq, alloc );
check_init c2( std::move(pq), alloc );
check_init c3( alloc );
check_init c4( cmp, alloc );
check_init c5( cmp, vec, alloc );
check_init c6( cmp, std::move(vec), alloc );
}
int
main()
{
test01();
}