From 92805612f4e0cdd33e10282eaf2cc0369bca3293 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 5 Oct 2016 13:01:57 +0100 Subject: [PATCH] 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 --- libstdc++-v3/ChangeLog | 5 ++ libstdc++-v3/include/bits/stl_queue.h | 12 ++-- .../23_containers/priority_queue/allocator.cc | 62 +++++++++++++++++++ 3 files changed, 73 insertions(+), 6 deletions(-) create mode 100644 libstdc++-v3/testsuite/23_containers/priority_queue/allocator.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 57c887dd1cc..7035f54068a 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,10 @@ 2016-10-05 Jonathan Wakely + 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. diff --git a/libstdc++-v3/include/bits/stl_queue.h b/libstdc++-v3/include/bits/stl_queue.h index da984ff255e..843199c5b06 100644 --- a/libstdc++-v3/include/bits/stl_queue.h +++ b/libstdc++-v3/include/bits/stl_queue.h @@ -462,28 +462,28 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template> explicit priority_queue(const _Alloc& __a) - : c(__a) { } + : c(__a), comp() { } template> priority_queue(const _Compare& __x, const _Alloc& __a) - : c(__x, __a) { } + : c(__a), comp(__x) { } template> priority_queue(const _Compare& __x, const _Sequence& __c, const _Alloc& __a) - : c(__x, __c, __a) { } + : c(__c, __a), comp(__x) { } template> priority_queue(const _Compare& __x, _Sequence&& __c, const _Alloc& __a) - : c(__x, std::move(__c), __a) { } + : c(std::move(__c), __a), comp(__x) { } template> priority_queue(const priority_queue& __q, const _Alloc& __a) - : c(__q.c, __a) { } + : c(__q.c, __a), comp(__q.comp) { } template> 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 /** diff --git a/libstdc++-v3/testsuite/23_containers/priority_queue/allocator.cc b/libstdc++-v3/testsuite/23_containers/priority_queue/allocator.cc new file mode 100644 index 00000000000..dd6ca259c64 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/priority_queue/allocator.cc @@ -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 +// . + +// { dg-do run { target c++11 } } + +#include +#include + +// 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, comp> +{ + template + 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 vec; + comp cmp{}; + std::allocator alloc; + std::priority_queue, 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(); +} -- 2.30.2