2001-06-27 19:09:53 +02:00
|
|
|
// Heap implementation -*- C++ -*-
|
|
|
|
|
re PR libstdc++/21172 (potential integer overflow error in STL heap functions)
2007-02-12 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/21172
* include/bits/stl_heap.h (__adjust_heap(_RandomAccessIterator,
_Distance, _Distance, _Tp), __adjust_heap(_RandomAccessIterator,
_Distance, _Distance, _Tp, _Compare)): Avoid potential integer
overflow.
* include/bits/stl_heap.h (__is_heap(_RandomAccessIterator,
_RandomAccessIterator), __is_heap(_RandomAccessIterator,
_RandomAccessIterator, _StrictWeakOrdering): Mark inline.
(make_heap(_RandomAccessIterator, _RandomAccessIterator,
_Compare)): Do not mark inline.
* include/bits/stl_heap.h (push_heap(_RandomAccessIterator,
_RandomAccessIterator), sort_heap(_RandomAccessIterator,
_RandomAccessIterator)): Uncomment __glibcxx_requires_heap.
From-SVN: r121875
2007-02-13 01:25:30 +01:00
|
|
|
// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
|
|
|
|
// Free Software Foundation, Inc.
|
2001-06-27 19:09:53 +02:00
|
|
|
//
|
|
|
|
// 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 2, 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 COPYING. If not, write to the Free
|
2005-08-17 04:28:44 +02:00
|
|
|
// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
2001-06-27 19:09:53 +02:00
|
|
|
// USA.
|
|
|
|
|
|
|
|
// As a special exception, you may use this file as part of a free software
|
|
|
|
// library without restriction. Specifically, if other files instantiate
|
|
|
|
// templates or use macros or inline functions from this file, or you compile
|
|
|
|
// this file and link it with other files to produce an executable, this
|
|
|
|
// file does not by itself cause the resulting executable to be covered by
|
|
|
|
// the GNU General Public License. This exception does not however
|
|
|
|
// invalidate any other reasons why the executable file might be covered by
|
|
|
|
// the GNU General Public License.
|
|
|
|
|
2000-10-05 13:27:02 +02:00
|
|
|
/*
|
|
|
|
*
|
|
|
|
* Copyright (c) 1994
|
|
|
|
* Hewlett-Packard Company
|
|
|
|
*
|
|
|
|
* Permission to use, copy, modify, distribute and sell this software
|
|
|
|
* and its documentation for any purpose is hereby granted without fee,
|
|
|
|
* provided that the above copyright notice appear in all copies and
|
|
|
|
* that both that copyright notice and this permission notice appear
|
|
|
|
* in supporting documentation. Hewlett-Packard Company makes no
|
|
|
|
* representations about the suitability of this software for any
|
|
|
|
* purpose. It is provided "as is" without express or implied warranty.
|
|
|
|
*
|
|
|
|
* Copyright (c) 1997
|
|
|
|
* Silicon Graphics Computer Systems, Inc.
|
|
|
|
*
|
|
|
|
* Permission to use, copy, modify, distribute and sell this software
|
|
|
|
* and its documentation for any purpose is hereby granted without fee,
|
|
|
|
* provided that the above copyright notice appear in all copies and
|
|
|
|
* that both that copyright notice and this permission notice appear
|
|
|
|
* in supporting documentation. Silicon Graphics makes no
|
|
|
|
* representations about the suitability of this software for any
|
|
|
|
* purpose. It is provided "as is" without express or implied warranty.
|
|
|
|
*/
|
|
|
|
|
c_io_stdio.h: Correct grammar in comments.
2001-11-02 Phil Edwards <pme@gcc.gnu.org>
* config/io/c_io_stdio.h: Correct grammar in comments.
* docs/doxygen/Intro.3: Expand "top-level" man page.
* docs/doxygen/doxygroups.cc: New module definitions (comments).
* docs/doxygen/mainpage.doxy: Tweaks.
* docs/doxygen/run_doxygen: Update Doxygen version, massage man pages.
Add @file hooks so that headers are considered to be documented.
* include/bits/basic_ios.h, include/bits/basic_file.h,
include/bits/basic_string.h, include/bits/boost_concept_check.h,
include/bits/char_traits.h, include/bits/codecvt.h,
include/bits/concept_check.h, include/bits/cpp_type_traits.h,
include/bits/fpos.h, include/bits/gslice.h, include/bits/gslice_array.h,
include/bits/indirect_array.h, include/bits/ios_base.h,
include/bits/locale_facets.h, include/bits/localefwd.h,
include/bits/mask_array.h, include/bits/pthread_allocimpl.h,
include/bits/slice.h, include/bits/slice_array.h,
include/bits/std_algorithm.h, include/bits/std_bitset.h,
include/bits/std_complex.h, include/bits/std_deque.h,
include/bits/std_fstream.h, include/bits/std_functional.h,
include/bits/std_iomanip.h, include/bits/std_ios.h,
include/bits/std_iosfwd.h, include/bits/std_iostream.h,
include/bits/std_istream.h, include/bits/std_iterator.h,
include/bits/std_limits.h, include/bits/std_list.h,
include/bits/std_locale.h, include/bits/std_map.h,
include/bits/std_memory.h, include/bits/std_numeric.h,
include/bits/std_ostream.h, include/bits/std_queue.h,
include/bits/std_set.h, include/bits/std_sstream.h,
include/bits/std_stack.h, include/bits/std_streambuf.h,
include/bits/std_string.h, include/bits/std_utility.h,
include/bits/std_valarray.h, include/bits/std_vector.h,
include/bits/stl_algo.h, include/bits/stl_alloc.h,
include/bits/stl_bvector.h, include/bits/stl_construct.h,
include/bits/stl_deque.h, include/bits/stl_heap.h,
include/bits/stl_iterator.h, include/bits/stl_iterator_base_funcs.h,
include/bits/stl_iterator_base_types.h, include/bits/stl_list.h,
include/bits/stl_map.h, include/bits/stl_multimap.h,
include/bits/stl_multiset.h, include/bits/stl_numeric.h,
include/bits/stl_pair.h, include/bits/stl_pthread_alloc.h,
include/bits/stl_queue.h, include/bits/stl_raw_storage_iter.h,
include/bits/stl_relops.h, include/bits/stl_set.h,
include/bits/stl_stack.h, include/bits/stl_tempbuf.h,
include/bits/stl_threads.h, include/bits/stl_tree.h,
include/bits/stl_uninitialized.h, include/bits/stl_vector.h,
include/bits/stream_iterator.h, include/bits/streambuf_iterator.h,
include/bits/stringfwd.h, include/bits/type_traits.h,
include/bits/valarray_array.h, include/bits/valarray_meta.h:
Add hooks, tweak comments only.
* include/bits/stl_algobase.h (swap, min, iter_swap): Also
document these functions.
* include/bits/stl_function.h: Tweak link comments.
From-SVN: r46717
2001-11-02 18:38:11 +01:00
|
|
|
/** @file stl_heap.h
|
|
|
|
* This is an internal header file, included by other library headers.
|
|
|
|
* You should not attempt to use it directly.
|
2000-10-05 13:27:02 +02:00
|
|
|
*/
|
|
|
|
|
2003-07-05 06:05:45 +02:00
|
|
|
#ifndef _STL_HEAP_H
|
|
|
|
#define _STL_HEAP_H 1
|
2000-10-05 13:27:02 +02:00
|
|
|
|
2003-11-11 21:09:16 +01:00
|
|
|
#include <debug/debug.h>
|
|
|
|
|
2005-12-19 01:56:05 +01:00
|
|
|
_GLIBCXX_BEGIN_NAMESPACE(std)
|
|
|
|
|
2003-11-11 21:09:16 +01:00
|
|
|
// is_heap, a predicate testing whether or not a range is
|
|
|
|
// a heap. This function is an extension, not part of the C++
|
|
|
|
// standard.
|
|
|
|
template<typename _RandomAccessIterator, typename _Distance>
|
|
|
|
bool
|
|
|
|
__is_heap(_RandomAccessIterator __first, _Distance __n)
|
|
|
|
{
|
|
|
|
_Distance __parent = 0;
|
2004-01-31 22:37:11 +01:00
|
|
|
for (_Distance __child = 1; __child < __n; ++__child)
|
|
|
|
{
|
2004-02-08 05:46:42 +01:00
|
|
|
if (__first[__parent] < __first[__child])
|
2004-01-31 22:37:11 +01:00
|
|
|
return false;
|
|
|
|
if ((__child & 1) == 0)
|
|
|
|
++__parent;
|
|
|
|
}
|
2003-11-11 21:09:16 +01:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
template<typename _RandomAccessIterator, typename _Distance,
|
|
|
|
typename _StrictWeakOrdering>
|
|
|
|
bool
|
|
|
|
__is_heap(_RandomAccessIterator __first, _StrictWeakOrdering __comp,
|
|
|
|
_Distance __n)
|
|
|
|
{
|
|
|
|
_Distance __parent = 0;
|
2004-01-31 22:37:11 +01:00
|
|
|
for (_Distance __child = 1; __child < __n; ++__child)
|
|
|
|
{
|
|
|
|
if (__comp(__first[__parent], __first[__child]))
|
|
|
|
return false;
|
|
|
|
if ((__child & 1) == 0)
|
|
|
|
++__parent;
|
|
|
|
}
|
2003-11-11 21:09:16 +01:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
template<typename _RandomAccessIterator>
|
re PR libstdc++/21172 (potential integer overflow error in STL heap functions)
2007-02-12 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/21172
* include/bits/stl_heap.h (__adjust_heap(_RandomAccessIterator,
_Distance, _Distance, _Tp), __adjust_heap(_RandomAccessIterator,
_Distance, _Distance, _Tp, _Compare)): Avoid potential integer
overflow.
* include/bits/stl_heap.h (__is_heap(_RandomAccessIterator,
_RandomAccessIterator), __is_heap(_RandomAccessIterator,
_RandomAccessIterator, _StrictWeakOrdering): Mark inline.
(make_heap(_RandomAccessIterator, _RandomAccessIterator,
_Compare)): Do not mark inline.
* include/bits/stl_heap.h (push_heap(_RandomAccessIterator,
_RandomAccessIterator), sort_heap(_RandomAccessIterator,
_RandomAccessIterator)): Uncomment __glibcxx_requires_heap.
From-SVN: r121875
2007-02-13 01:25:30 +01:00
|
|
|
inline bool
|
2003-11-11 21:09:16 +01:00
|
|
|
__is_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)
|
|
|
|
{ return std::__is_heap(__first, std::distance(__first, __last)); }
|
|
|
|
|
|
|
|
template<typename _RandomAccessIterator, typename _StrictWeakOrdering>
|
re PR libstdc++/21172 (potential integer overflow error in STL heap functions)
2007-02-12 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/21172
* include/bits/stl_heap.h (__adjust_heap(_RandomAccessIterator,
_Distance, _Distance, _Tp), __adjust_heap(_RandomAccessIterator,
_Distance, _Distance, _Tp, _Compare)): Avoid potential integer
overflow.
* include/bits/stl_heap.h (__is_heap(_RandomAccessIterator,
_RandomAccessIterator), __is_heap(_RandomAccessIterator,
_RandomAccessIterator, _StrictWeakOrdering): Mark inline.
(make_heap(_RandomAccessIterator, _RandomAccessIterator,
_Compare)): Do not mark inline.
* include/bits/stl_heap.h (push_heap(_RandomAccessIterator,
_RandomAccessIterator), sort_heap(_RandomAccessIterator,
_RandomAccessIterator)): Uncomment __glibcxx_requires_heap.
From-SVN: r121875
2007-02-13 01:25:30 +01:00
|
|
|
inline bool
|
2003-11-11 21:09:16 +01:00
|
|
|
__is_heap(_RandomAccessIterator __first, _RandomAccessIterator __last,
|
re PR libstdc++/21172 (potential integer overflow error in STL heap functions)
2007-02-12 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/21172
* include/bits/stl_heap.h (__adjust_heap(_RandomAccessIterator,
_Distance, _Distance, _Tp), __adjust_heap(_RandomAccessIterator,
_Distance, _Distance, _Tp, _Compare)): Avoid potential integer
overflow.
* include/bits/stl_heap.h (__is_heap(_RandomAccessIterator,
_RandomAccessIterator), __is_heap(_RandomAccessIterator,
_RandomAccessIterator, _StrictWeakOrdering): Mark inline.
(make_heap(_RandomAccessIterator, _RandomAccessIterator,
_Compare)): Do not mark inline.
* include/bits/stl_heap.h (push_heap(_RandomAccessIterator,
_RandomAccessIterator), sort_heap(_RandomAccessIterator,
_RandomAccessIterator)): Uncomment __glibcxx_requires_heap.
From-SVN: r121875
2007-02-13 01:25:30 +01:00
|
|
|
_StrictWeakOrdering __comp)
|
2003-11-11 21:09:16 +01:00
|
|
|
{ return std::__is_heap(__first, __comp, std::distance(__first, __last)); }
|
2000-10-05 13:27:02 +02:00
|
|
|
|
2001-07-18 19:09:02 +02:00
|
|
|
// Heap-manipulation functions: push_heap, pop_heap, make_heap, sort_heap.
|
|
|
|
|
|
|
|
template<typename _RandomAccessIterator, typename _Distance, typename _Tp>
|
2004-02-08 05:46:42 +01:00
|
|
|
void
|
2001-07-18 19:09:02 +02:00
|
|
|
__push_heap(_RandomAccessIterator __first,
|
|
|
|
_Distance __holeIndex, _Distance __topIndex, _Tp __value)
|
|
|
|
{
|
|
|
|
_Distance __parent = (__holeIndex - 1) / 2;
|
2004-01-31 22:37:11 +01:00
|
|
|
while (__holeIndex > __topIndex && *(__first + __parent) < __value)
|
|
|
|
{
|
|
|
|
*(__first + __holeIndex) = *(__first + __parent);
|
|
|
|
__holeIndex = __parent;
|
|
|
|
__parent = (__holeIndex - 1) / 2;
|
|
|
|
}
|
2001-07-18 19:09:02 +02:00
|
|
|
*(__first + __holeIndex) = __value;
|
|
|
|
}
|
|
|
|
|
stl_algo.h (includes, [...]): Document.
2003-07-15 Jerry Quinn <jlquinn@optonline.net>
* include/bits/stl_algo.h (includes, set_union, set_intersection,
set_difference, set_symmetric_difference, max_element, min_element,
next_permutation, prev_permutation, find_first_of, find_end):
Document.
* include/bits/stl_algobase.h (copy,copy_backward): Clarify overlap
restrictions in docs.
* include/bits/stl_heap.h (push_heap, pop_heap, make_heap, sort_heap):
Document.
* docs/doxygen/doxygroups.cc (setoperations): New group.
From-SVN: r69387
2003-07-15 09:30:29 +02:00
|
|
|
/**
|
|
|
|
* @brief Push an element onto a heap.
|
|
|
|
* @param first Start of heap.
|
|
|
|
* @param last End of heap + element.
|
|
|
|
* @ingroup heap
|
|
|
|
*
|
|
|
|
* This operation pushes the element at last-1 onto the valid heap over the
|
|
|
|
* range [first,last-1). After completion, [first,last) is a valid heap.
|
|
|
|
*/
|
2001-07-18 19:09:02 +02:00
|
|
|
template<typename _RandomAccessIterator>
|
2004-02-08 05:46:42 +01:00
|
|
|
inline void
|
2001-07-18 19:09:02 +02:00
|
|
|
push_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)
|
|
|
|
{
|
|
|
|
typedef typename iterator_traits<_RandomAccessIterator>::value_type
|
|
|
|
_ValueType;
|
|
|
|
typedef typename iterator_traits<_RandomAccessIterator>::difference_type
|
|
|
|
_DistanceType;
|
|
|
|
|
|
|
|
// concept requirements
|
2003-07-05 06:05:45 +02:00
|
|
|
__glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
|
2001-11-01 16:46:48 +01:00
|
|
|
_RandomAccessIterator>)
|
2003-07-05 06:05:45 +02:00
|
|
|
__glibcxx_function_requires(_LessThanComparableConcept<_ValueType>)
|
2003-11-11 21:09:16 +01:00
|
|
|
__glibcxx_requires_valid_range(__first, __last);
|
re PR libstdc++/21172 (potential integer overflow error in STL heap functions)
2007-02-12 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/21172
* include/bits/stl_heap.h (__adjust_heap(_RandomAccessIterator,
_Distance, _Distance, _Tp), __adjust_heap(_RandomAccessIterator,
_Distance, _Distance, _Tp, _Compare)): Avoid potential integer
overflow.
* include/bits/stl_heap.h (__is_heap(_RandomAccessIterator,
_RandomAccessIterator), __is_heap(_RandomAccessIterator,
_RandomAccessIterator, _StrictWeakOrdering): Mark inline.
(make_heap(_RandomAccessIterator, _RandomAccessIterator,
_Compare)): Do not mark inline.
* include/bits/stl_heap.h (push_heap(_RandomAccessIterator,
_RandomAccessIterator), sort_heap(_RandomAccessIterator,
_RandomAccessIterator)): Uncomment __glibcxx_requires_heap.
From-SVN: r121875
2007-02-13 01:25:30 +01:00
|
|
|
__glibcxx_requires_heap(__first, __last - 1);
|
2001-07-18 19:09:02 +02:00
|
|
|
|
2004-01-31 22:37:11 +01:00
|
|
|
std::__push_heap(__first, _DistanceType((__last - __first) - 1),
|
|
|
|
_DistanceType(0), _ValueType(*(__last - 1)));
|
2001-07-18 19:09:02 +02:00
|
|
|
}
|
|
|
|
|
2004-02-08 05:46:42 +01:00
|
|
|
template<typename _RandomAccessIterator, typename _Distance, typename _Tp,
|
2001-07-18 19:09:02 +02:00
|
|
|
typename _Compare>
|
|
|
|
void
|
|
|
|
__push_heap(_RandomAccessIterator __first, _Distance __holeIndex,
|
|
|
|
_Distance __topIndex, _Tp __value, _Compare __comp)
|
|
|
|
{
|
|
|
|
_Distance __parent = (__holeIndex - 1) / 2;
|
2004-01-31 22:37:11 +01:00
|
|
|
while (__holeIndex > __topIndex
|
|
|
|
&& __comp(*(__first + __parent), __value))
|
|
|
|
{
|
|
|
|
*(__first + __holeIndex) = *(__first + __parent);
|
|
|
|
__holeIndex = __parent;
|
|
|
|
__parent = (__holeIndex - 1) / 2;
|
|
|
|
}
|
2001-07-18 19:09:02 +02:00
|
|
|
*(__first + __holeIndex) = __value;
|
|
|
|
}
|
|
|
|
|
stl_algo.h (includes, [...]): Document.
2003-07-15 Jerry Quinn <jlquinn@optonline.net>
* include/bits/stl_algo.h (includes, set_union, set_intersection,
set_difference, set_symmetric_difference, max_element, min_element,
next_permutation, prev_permutation, find_first_of, find_end):
Document.
* include/bits/stl_algobase.h (copy,copy_backward): Clarify overlap
restrictions in docs.
* include/bits/stl_heap.h (push_heap, pop_heap, make_heap, sort_heap):
Document.
* docs/doxygen/doxygroups.cc (setoperations): New group.
From-SVN: r69387
2003-07-15 09:30:29 +02:00
|
|
|
/**
|
|
|
|
* @brief Push an element onto a heap using comparison functor.
|
|
|
|
* @param first Start of heap.
|
|
|
|
* @param last End of heap + element.
|
|
|
|
* @param comp Comparison functor.
|
|
|
|
* @ingroup heap
|
|
|
|
*
|
|
|
|
* This operation pushes the element at last-1 onto the valid heap over the
|
|
|
|
* range [first,last-1). After completion, [first,last) is a valid heap.
|
|
|
|
* Compare operations are performed using comp.
|
|
|
|
*/
|
2001-07-18 19:09:02 +02:00
|
|
|
template<typename _RandomAccessIterator, typename _Compare>
|
2004-02-08 05:46:42 +01:00
|
|
|
inline void
|
2001-07-18 19:09:02 +02:00
|
|
|
push_heap(_RandomAccessIterator __first, _RandomAccessIterator __last,
|
|
|
|
_Compare __comp)
|
|
|
|
{
|
|
|
|
typedef typename iterator_traits<_RandomAccessIterator>::value_type
|
|
|
|
_ValueType;
|
|
|
|
typedef typename iterator_traits<_RandomAccessIterator>::difference_type
|
|
|
|
_DistanceType;
|
|
|
|
|
|
|
|
// concept requirements
|
2003-07-05 06:05:45 +02:00
|
|
|
__glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
|
2001-11-01 16:46:48 +01:00
|
|
|
_RandomAccessIterator>)
|
2003-11-11 21:09:16 +01:00
|
|
|
__glibcxx_requires_valid_range(__first, __last);
|
|
|
|
__glibcxx_requires_heap_pred(__first, __last - 1, __comp);
|
2001-07-18 19:09:02 +02:00
|
|
|
|
2004-01-31 22:37:11 +01:00
|
|
|
std::__push_heap(__first, _DistanceType((__last - __first) - 1),
|
|
|
|
_DistanceType(0), _ValueType(*(__last - 1)), __comp);
|
2001-07-18 19:09:02 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
template<typename _RandomAccessIterator, typename _Distance, typename _Tp>
|
2004-02-08 05:46:42 +01:00
|
|
|
void
|
2001-07-18 19:09:02 +02:00
|
|
|
__adjust_heap(_RandomAccessIterator __first, _Distance __holeIndex,
|
|
|
|
_Distance __len, _Tp __value)
|
|
|
|
{
|
2004-01-31 22:37:11 +01:00
|
|
|
const _Distance __topIndex = __holeIndex;
|
re PR libstdc++/21172 (potential integer overflow error in STL heap functions)
2007-02-12 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/21172
* include/bits/stl_heap.h (__adjust_heap(_RandomAccessIterator,
_Distance, _Distance, _Tp), __adjust_heap(_RandomAccessIterator,
_Distance, _Distance, _Tp, _Compare)): Avoid potential integer
overflow.
* include/bits/stl_heap.h (__is_heap(_RandomAccessIterator,
_RandomAccessIterator), __is_heap(_RandomAccessIterator,
_RandomAccessIterator, _StrictWeakOrdering): Mark inline.
(make_heap(_RandomAccessIterator, _RandomAccessIterator,
_Compare)): Do not mark inline.
* include/bits/stl_heap.h (push_heap(_RandomAccessIterator,
_RandomAccessIterator), sort_heap(_RandomAccessIterator,
_RandomAccessIterator)): Uncomment __glibcxx_requires_heap.
From-SVN: r121875
2007-02-13 01:25:30 +01:00
|
|
|
_Distance __secondChild = __holeIndex;
|
|
|
|
while (__secondChild < (__len - 1) / 2)
|
2004-01-31 22:37:11 +01:00
|
|
|
{
|
re PR libstdc++/21172 (potential integer overflow error in STL heap functions)
2007-02-12 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/21172
* include/bits/stl_heap.h (__adjust_heap(_RandomAccessIterator,
_Distance, _Distance, _Tp), __adjust_heap(_RandomAccessIterator,
_Distance, _Distance, _Tp, _Compare)): Avoid potential integer
overflow.
* include/bits/stl_heap.h (__is_heap(_RandomAccessIterator,
_RandomAccessIterator), __is_heap(_RandomAccessIterator,
_RandomAccessIterator, _StrictWeakOrdering): Mark inline.
(make_heap(_RandomAccessIterator, _RandomAccessIterator,
_Compare)): Do not mark inline.
* include/bits/stl_heap.h (push_heap(_RandomAccessIterator,
_RandomAccessIterator), sort_heap(_RandomAccessIterator,
_RandomAccessIterator)): Uncomment __glibcxx_requires_heap.
From-SVN: r121875
2007-02-13 01:25:30 +01:00
|
|
|
__secondChild = 2 * (__secondChild + 1);
|
2004-01-31 22:37:11 +01:00
|
|
|
if (*(__first + __secondChild) < *(__first + (__secondChild - 1)))
|
|
|
|
__secondChild--;
|
|
|
|
*(__first + __holeIndex) = *(__first + __secondChild);
|
|
|
|
__holeIndex = __secondChild;
|
|
|
|
}
|
re PR libstdc++/21172 (potential integer overflow error in STL heap functions)
2007-02-12 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/21172
* include/bits/stl_heap.h (__adjust_heap(_RandomAccessIterator,
_Distance, _Distance, _Tp), __adjust_heap(_RandomAccessIterator,
_Distance, _Distance, _Tp, _Compare)): Avoid potential integer
overflow.
* include/bits/stl_heap.h (__is_heap(_RandomAccessIterator,
_RandomAccessIterator), __is_heap(_RandomAccessIterator,
_RandomAccessIterator, _StrictWeakOrdering): Mark inline.
(make_heap(_RandomAccessIterator, _RandomAccessIterator,
_Compare)): Do not mark inline.
* include/bits/stl_heap.h (push_heap(_RandomAccessIterator,
_RandomAccessIterator), sort_heap(_RandomAccessIterator,
_RandomAccessIterator)): Uncomment __glibcxx_requires_heap.
From-SVN: r121875
2007-02-13 01:25:30 +01:00
|
|
|
if ((__len & 1) == 0 && __secondChild == (__len - 2) / 2)
|
2004-01-31 22:37:11 +01:00
|
|
|
{
|
re PR libstdc++/21172 (potential integer overflow error in STL heap functions)
2007-02-12 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/21172
* include/bits/stl_heap.h (__adjust_heap(_RandomAccessIterator,
_Distance, _Distance, _Tp), __adjust_heap(_RandomAccessIterator,
_Distance, _Distance, _Tp, _Compare)): Avoid potential integer
overflow.
* include/bits/stl_heap.h (__is_heap(_RandomAccessIterator,
_RandomAccessIterator), __is_heap(_RandomAccessIterator,
_RandomAccessIterator, _StrictWeakOrdering): Mark inline.
(make_heap(_RandomAccessIterator, _RandomAccessIterator,
_Compare)): Do not mark inline.
* include/bits/stl_heap.h (push_heap(_RandomAccessIterator,
_RandomAccessIterator), sort_heap(_RandomAccessIterator,
_RandomAccessIterator)): Uncomment __glibcxx_requires_heap.
From-SVN: r121875
2007-02-13 01:25:30 +01:00
|
|
|
__secondChild = 2 * (__secondChild + 1);
|
2004-01-31 22:37:11 +01:00
|
|
|
*(__first + __holeIndex) = *(__first + (__secondChild - 1));
|
|
|
|
__holeIndex = __secondChild - 1;
|
|
|
|
}
|
2003-07-04 09:22:19 +02:00
|
|
|
std::__push_heap(__first, __holeIndex, __topIndex, __value);
|
2001-07-18 19:09:02 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
template<typename _RandomAccessIterator, typename _Tp>
|
2004-02-08 05:46:42 +01:00
|
|
|
inline void
|
2001-07-18 19:09:02 +02:00
|
|
|
__pop_heap(_RandomAccessIterator __first, _RandomAccessIterator __last,
|
|
|
|
_RandomAccessIterator __result, _Tp __value)
|
|
|
|
{
|
2004-01-31 22:37:11 +01:00
|
|
|
typedef typename iterator_traits<_RandomAccessIterator>::difference_type
|
|
|
|
_Distance;
|
2001-07-18 19:09:02 +02:00
|
|
|
*__result = *__first;
|
2004-01-31 22:37:11 +01:00
|
|
|
std::__adjust_heap(__first, _Distance(0), _Distance(__last - __first),
|
|
|
|
__value);
|
2001-07-18 19:09:02 +02:00
|
|
|
}
|
|
|
|
|
stl_algo.h (includes, [...]): Document.
2003-07-15 Jerry Quinn <jlquinn@optonline.net>
* include/bits/stl_algo.h (includes, set_union, set_intersection,
set_difference, set_symmetric_difference, max_element, min_element,
next_permutation, prev_permutation, find_first_of, find_end):
Document.
* include/bits/stl_algobase.h (copy,copy_backward): Clarify overlap
restrictions in docs.
* include/bits/stl_heap.h (push_heap, pop_heap, make_heap, sort_heap):
Document.
* docs/doxygen/doxygroups.cc (setoperations): New group.
From-SVN: r69387
2003-07-15 09:30:29 +02:00
|
|
|
/**
|
|
|
|
* @brief Pop an element off a heap.
|
|
|
|
* @param first Start of heap.
|
|
|
|
* @param last End of heap.
|
|
|
|
* @ingroup heap
|
|
|
|
*
|
|
|
|
* This operation pops the top of the heap. The elements first and last-1
|
|
|
|
* are swapped and [first,last-1) is made into a heap.
|
|
|
|
*/
|
2001-07-18 19:09:02 +02:00
|
|
|
template<typename _RandomAccessIterator>
|
|
|
|
inline void
|
|
|
|
pop_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)
|
|
|
|
{
|
2004-01-31 22:37:11 +01:00
|
|
|
typedef typename iterator_traits<_RandomAccessIterator>::value_type
|
|
|
|
_ValueType;
|
2001-07-18 19:09:02 +02:00
|
|
|
|
|
|
|
// concept requirements
|
2003-07-05 06:05:45 +02:00
|
|
|
__glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
|
2001-11-01 16:46:48 +01:00
|
|
|
_RandomAccessIterator>)
|
2003-07-05 06:05:45 +02:00
|
|
|
__glibcxx_function_requires(_LessThanComparableConcept<_ValueType>)
|
2003-11-11 21:09:16 +01:00
|
|
|
__glibcxx_requires_valid_range(__first, __last);
|
|
|
|
__glibcxx_requires_heap(__first, __last);
|
2001-07-18 19:09:02 +02:00
|
|
|
|
2004-01-31 22:37:11 +01:00
|
|
|
std::__pop_heap(__first, __last - 1, __last - 1,
|
|
|
|
_ValueType(*(__last - 1)));
|
2001-07-18 19:09:02 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
template<typename _RandomAccessIterator, typename _Distance,
|
|
|
|
typename _Tp, typename _Compare>
|
|
|
|
void
|
|
|
|
__adjust_heap(_RandomAccessIterator __first, _Distance __holeIndex,
|
|
|
|
_Distance __len, _Tp __value, _Compare __comp)
|
|
|
|
{
|
2004-01-31 22:37:11 +01:00
|
|
|
const _Distance __topIndex = __holeIndex;
|
re PR libstdc++/21172 (potential integer overflow error in STL heap functions)
2007-02-12 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/21172
* include/bits/stl_heap.h (__adjust_heap(_RandomAccessIterator,
_Distance, _Distance, _Tp), __adjust_heap(_RandomAccessIterator,
_Distance, _Distance, _Tp, _Compare)): Avoid potential integer
overflow.
* include/bits/stl_heap.h (__is_heap(_RandomAccessIterator,
_RandomAccessIterator), __is_heap(_RandomAccessIterator,
_RandomAccessIterator, _StrictWeakOrdering): Mark inline.
(make_heap(_RandomAccessIterator, _RandomAccessIterator,
_Compare)): Do not mark inline.
* include/bits/stl_heap.h (push_heap(_RandomAccessIterator,
_RandomAccessIterator), sort_heap(_RandomAccessIterator,
_RandomAccessIterator)): Uncomment __glibcxx_requires_heap.
From-SVN: r121875
2007-02-13 01:25:30 +01:00
|
|
|
_Distance __secondChild = __holeIndex;
|
|
|
|
while (__secondChild < (__len - 1) / 2)
|
2004-01-31 22:37:11 +01:00
|
|
|
{
|
re PR libstdc++/21172 (potential integer overflow error in STL heap functions)
2007-02-12 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/21172
* include/bits/stl_heap.h (__adjust_heap(_RandomAccessIterator,
_Distance, _Distance, _Tp), __adjust_heap(_RandomAccessIterator,
_Distance, _Distance, _Tp, _Compare)): Avoid potential integer
overflow.
* include/bits/stl_heap.h (__is_heap(_RandomAccessIterator,
_RandomAccessIterator), __is_heap(_RandomAccessIterator,
_RandomAccessIterator, _StrictWeakOrdering): Mark inline.
(make_heap(_RandomAccessIterator, _RandomAccessIterator,
_Compare)): Do not mark inline.
* include/bits/stl_heap.h (push_heap(_RandomAccessIterator,
_RandomAccessIterator), sort_heap(_RandomAccessIterator,
_RandomAccessIterator)): Uncomment __glibcxx_requires_heap.
From-SVN: r121875
2007-02-13 01:25:30 +01:00
|
|
|
__secondChild = 2 * (__secondChild + 1);
|
2004-01-31 22:37:11 +01:00
|
|
|
if (__comp(*(__first + __secondChild),
|
|
|
|
*(__first + (__secondChild - 1))))
|
|
|
|
__secondChild--;
|
|
|
|
*(__first + __holeIndex) = *(__first + __secondChild);
|
|
|
|
__holeIndex = __secondChild;
|
|
|
|
}
|
re PR libstdc++/21172 (potential integer overflow error in STL heap functions)
2007-02-12 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/21172
* include/bits/stl_heap.h (__adjust_heap(_RandomAccessIterator,
_Distance, _Distance, _Tp), __adjust_heap(_RandomAccessIterator,
_Distance, _Distance, _Tp, _Compare)): Avoid potential integer
overflow.
* include/bits/stl_heap.h (__is_heap(_RandomAccessIterator,
_RandomAccessIterator), __is_heap(_RandomAccessIterator,
_RandomAccessIterator, _StrictWeakOrdering): Mark inline.
(make_heap(_RandomAccessIterator, _RandomAccessIterator,
_Compare)): Do not mark inline.
* include/bits/stl_heap.h (push_heap(_RandomAccessIterator,
_RandomAccessIterator), sort_heap(_RandomAccessIterator,
_RandomAccessIterator)): Uncomment __glibcxx_requires_heap.
From-SVN: r121875
2007-02-13 01:25:30 +01:00
|
|
|
if ((__len & 1) == 0 && __secondChild == (__len - 2) / 2)
|
2004-01-31 22:37:11 +01:00
|
|
|
{
|
re PR libstdc++/21172 (potential integer overflow error in STL heap functions)
2007-02-12 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/21172
* include/bits/stl_heap.h (__adjust_heap(_RandomAccessIterator,
_Distance, _Distance, _Tp), __adjust_heap(_RandomAccessIterator,
_Distance, _Distance, _Tp, _Compare)): Avoid potential integer
overflow.
* include/bits/stl_heap.h (__is_heap(_RandomAccessIterator,
_RandomAccessIterator), __is_heap(_RandomAccessIterator,
_RandomAccessIterator, _StrictWeakOrdering): Mark inline.
(make_heap(_RandomAccessIterator, _RandomAccessIterator,
_Compare)): Do not mark inline.
* include/bits/stl_heap.h (push_heap(_RandomAccessIterator,
_RandomAccessIterator), sort_heap(_RandomAccessIterator,
_RandomAccessIterator)): Uncomment __glibcxx_requires_heap.
From-SVN: r121875
2007-02-13 01:25:30 +01:00
|
|
|
__secondChild = 2 * (__secondChild + 1);
|
2004-01-31 22:37:11 +01:00
|
|
|
*(__first + __holeIndex) = *(__first + (__secondChild - 1));
|
|
|
|
__holeIndex = __secondChild - 1;
|
|
|
|
}
|
2003-07-04 09:22:19 +02:00
|
|
|
std::__push_heap(__first, __holeIndex, __topIndex, __value, __comp);
|
2001-07-18 19:09:02 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
template<typename _RandomAccessIterator, typename _Tp, typename _Compare>
|
2004-02-08 05:46:42 +01:00
|
|
|
inline void
|
2001-07-18 19:09:02 +02:00
|
|
|
__pop_heap(_RandomAccessIterator __first, _RandomAccessIterator __last,
|
|
|
|
_RandomAccessIterator __result, _Tp __value, _Compare __comp)
|
|
|
|
{
|
2004-01-31 22:37:11 +01:00
|
|
|
typedef typename iterator_traits<_RandomAccessIterator>::difference_type
|
|
|
|
_Distance;
|
2001-07-18 19:09:02 +02:00
|
|
|
*__result = *__first;
|
2004-01-31 22:37:11 +01:00
|
|
|
std::__adjust_heap(__first, _Distance(0), _Distance(__last - __first),
|
2003-07-04 09:22:19 +02:00
|
|
|
__value, __comp);
|
2001-07-18 19:09:02 +02:00
|
|
|
}
|
|
|
|
|
stl_algo.h (includes, [...]): Document.
2003-07-15 Jerry Quinn <jlquinn@optonline.net>
* include/bits/stl_algo.h (includes, set_union, set_intersection,
set_difference, set_symmetric_difference, max_element, min_element,
next_permutation, prev_permutation, find_first_of, find_end):
Document.
* include/bits/stl_algobase.h (copy,copy_backward): Clarify overlap
restrictions in docs.
* include/bits/stl_heap.h (push_heap, pop_heap, make_heap, sort_heap):
Document.
* docs/doxygen/doxygroups.cc (setoperations): New group.
From-SVN: r69387
2003-07-15 09:30:29 +02:00
|
|
|
/**
|
|
|
|
* @brief Pop an element off a heap using comparison functor.
|
|
|
|
* @param first Start of heap.
|
|
|
|
* @param last End of heap.
|
|
|
|
* @param comp Comparison functor to use.
|
|
|
|
* @ingroup heap
|
|
|
|
*
|
|
|
|
* This operation pops the top of the heap. The elements first and last-1
|
|
|
|
* are swapped and [first,last-1) is made into a heap. Comparisons are
|
|
|
|
* made using comp.
|
|
|
|
*/
|
2001-07-18 19:09:02 +02:00
|
|
|
template<typename _RandomAccessIterator, typename _Compare>
|
2004-02-08 05:46:42 +01:00
|
|
|
inline void
|
2001-07-18 19:09:02 +02:00
|
|
|
pop_heap(_RandomAccessIterator __first,
|
|
|
|
_RandomAccessIterator __last, _Compare __comp)
|
|
|
|
{
|
re PR libstdc++/21172 (potential integer overflow error in STL heap functions)
2007-02-12 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/21172
* include/bits/stl_heap.h (__adjust_heap(_RandomAccessIterator,
_Distance, _Distance, _Tp), __adjust_heap(_RandomAccessIterator,
_Distance, _Distance, _Tp, _Compare)): Avoid potential integer
overflow.
* include/bits/stl_heap.h (__is_heap(_RandomAccessIterator,
_RandomAccessIterator), __is_heap(_RandomAccessIterator,
_RandomAccessIterator, _StrictWeakOrdering): Mark inline.
(make_heap(_RandomAccessIterator, _RandomAccessIterator,
_Compare)): Do not mark inline.
* include/bits/stl_heap.h (push_heap(_RandomAccessIterator,
_RandomAccessIterator), sort_heap(_RandomAccessIterator,
_RandomAccessIterator)): Uncomment __glibcxx_requires_heap.
From-SVN: r121875
2007-02-13 01:25:30 +01:00
|
|
|
typedef typename iterator_traits<_RandomAccessIterator>::value_type
|
|
|
|
_ValueType;
|
|
|
|
|
2001-07-18 19:09:02 +02:00
|
|
|
// concept requirements
|
2003-07-05 06:05:45 +02:00
|
|
|
__glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
|
2001-11-01 16:46:48 +01:00
|
|
|
_RandomAccessIterator>)
|
2003-11-11 21:09:16 +01:00
|
|
|
__glibcxx_requires_valid_range(__first, __last);
|
|
|
|
__glibcxx_requires_heap_pred(__first, __last, __comp);
|
2001-07-18 19:09:02 +02:00
|
|
|
|
2004-01-31 22:37:11 +01:00
|
|
|
std::__pop_heap(__first, __last - 1, __last - 1,
|
|
|
|
_ValueType(*(__last - 1)), __comp);
|
2001-07-18 19:09:02 +02:00
|
|
|
}
|
|
|
|
|
stl_algo.h (includes, [...]): Document.
2003-07-15 Jerry Quinn <jlquinn@optonline.net>
* include/bits/stl_algo.h (includes, set_union, set_intersection,
set_difference, set_symmetric_difference, max_element, min_element,
next_permutation, prev_permutation, find_first_of, find_end):
Document.
* include/bits/stl_algobase.h (copy,copy_backward): Clarify overlap
restrictions in docs.
* include/bits/stl_heap.h (push_heap, pop_heap, make_heap, sort_heap):
Document.
* docs/doxygen/doxygroups.cc (setoperations): New group.
From-SVN: r69387
2003-07-15 09:30:29 +02:00
|
|
|
/**
|
|
|
|
* @brief Construct a heap over a range.
|
|
|
|
* @param first Start of heap.
|
|
|
|
* @param last End of heap.
|
|
|
|
* @ingroup heap
|
|
|
|
*
|
|
|
|
* This operation makes the elements in [first,last) into a heap.
|
|
|
|
*/
|
2001-07-18 19:09:02 +02:00
|
|
|
template<typename _RandomAccessIterator>
|
2004-02-08 05:46:42 +01:00
|
|
|
void
|
2001-07-18 19:09:02 +02:00
|
|
|
make_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)
|
|
|
|
{
|
|
|
|
typedef typename iterator_traits<_RandomAccessIterator>::value_type
|
|
|
|
_ValueType;
|
|
|
|
typedef typename iterator_traits<_RandomAccessIterator>::difference_type
|
|
|
|
_DistanceType;
|
|
|
|
|
|
|
|
// concept requirements
|
2003-07-05 06:05:45 +02:00
|
|
|
__glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
|
2001-11-01 16:46:48 +01:00
|
|
|
_RandomAccessIterator>)
|
2003-07-05 06:05:45 +02:00
|
|
|
__glibcxx_function_requires(_LessThanComparableConcept<_ValueType>)
|
2003-11-11 21:09:16 +01:00
|
|
|
__glibcxx_requires_valid_range(__first, __last);
|
2001-07-18 19:09:02 +02:00
|
|
|
|
2004-01-31 22:37:11 +01:00
|
|
|
if (__last - __first < 2)
|
|
|
|
return;
|
|
|
|
|
2004-02-08 05:46:42 +01:00
|
|
|
const _DistanceType __len = __last - __first;
|
2004-01-31 22:37:11 +01:00
|
|
|
_DistanceType __parent = (__len - 2) / 2;
|
|
|
|
while (true)
|
|
|
|
{
|
|
|
|
std::__adjust_heap(__first, __parent, __len,
|
|
|
|
_ValueType(*(__first + __parent)));
|
|
|
|
if (__parent == 0)
|
|
|
|
return;
|
|
|
|
__parent--;
|
|
|
|
}
|
2001-07-18 19:09:02 +02:00
|
|
|
}
|
|
|
|
|
stl_algo.h (includes, [...]): Document.
2003-07-15 Jerry Quinn <jlquinn@optonline.net>
* include/bits/stl_algo.h (includes, set_union, set_intersection,
set_difference, set_symmetric_difference, max_element, min_element,
next_permutation, prev_permutation, find_first_of, find_end):
Document.
* include/bits/stl_algobase.h (copy,copy_backward): Clarify overlap
restrictions in docs.
* include/bits/stl_heap.h (push_heap, pop_heap, make_heap, sort_heap):
Document.
* docs/doxygen/doxygroups.cc (setoperations): New group.
From-SVN: r69387
2003-07-15 09:30:29 +02:00
|
|
|
/**
|
|
|
|
* @brief Construct a heap over a range using comparison functor.
|
|
|
|
* @param first Start of heap.
|
|
|
|
* @param last End of heap.
|
|
|
|
* @param comp Comparison functor to use.
|
|
|
|
* @ingroup heap
|
|
|
|
*
|
|
|
|
* This operation makes the elements in [first,last) into a heap.
|
|
|
|
* Comparisons are made using comp.
|
|
|
|
*/
|
2001-07-18 19:09:02 +02:00
|
|
|
template<typename _RandomAccessIterator, typename _Compare>
|
re PR libstdc++/21172 (potential integer overflow error in STL heap functions)
2007-02-12 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/21172
* include/bits/stl_heap.h (__adjust_heap(_RandomAccessIterator,
_Distance, _Distance, _Tp), __adjust_heap(_RandomAccessIterator,
_Distance, _Distance, _Tp, _Compare)): Avoid potential integer
overflow.
* include/bits/stl_heap.h (__is_heap(_RandomAccessIterator,
_RandomAccessIterator), __is_heap(_RandomAccessIterator,
_RandomAccessIterator, _StrictWeakOrdering): Mark inline.
(make_heap(_RandomAccessIterator, _RandomAccessIterator,
_Compare)): Do not mark inline.
* include/bits/stl_heap.h (push_heap(_RandomAccessIterator,
_RandomAccessIterator), sort_heap(_RandomAccessIterator,
_RandomAccessIterator)): Uncomment __glibcxx_requires_heap.
From-SVN: r121875
2007-02-13 01:25:30 +01:00
|
|
|
void
|
2001-07-18 19:09:02 +02:00
|
|
|
make_heap(_RandomAccessIterator __first, _RandomAccessIterator __last,
|
|
|
|
_Compare __comp)
|
|
|
|
{
|
|
|
|
typedef typename iterator_traits<_RandomAccessIterator>::value_type
|
|
|
|
_ValueType;
|
|
|
|
typedef typename iterator_traits<_RandomAccessIterator>::difference_type
|
|
|
|
_DistanceType;
|
|
|
|
|
|
|
|
// concept requirements
|
2003-07-05 06:05:45 +02:00
|
|
|
__glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
|
2001-11-01 16:46:48 +01:00
|
|
|
_RandomAccessIterator>)
|
2003-11-11 21:09:16 +01:00
|
|
|
__glibcxx_requires_valid_range(__first, __last);
|
2004-02-08 05:46:42 +01:00
|
|
|
|
2004-01-31 22:37:11 +01:00
|
|
|
if (__last - __first < 2)
|
|
|
|
return;
|
|
|
|
|
|
|
|
const _DistanceType __len = __last - __first;
|
|
|
|
_DistanceType __parent = (__len - 2) / 2;
|
|
|
|
while (true)
|
|
|
|
{
|
|
|
|
std::__adjust_heap(__first, __parent, __len,
|
|
|
|
_ValueType(*(__first + __parent)), __comp);
|
|
|
|
if (__parent == 0)
|
|
|
|
return;
|
|
|
|
__parent--;
|
|
|
|
}
|
2001-07-18 19:09:02 +02:00
|
|
|
}
|
|
|
|
|
stl_algo.h (includes, [...]): Document.
2003-07-15 Jerry Quinn <jlquinn@optonline.net>
* include/bits/stl_algo.h (includes, set_union, set_intersection,
set_difference, set_symmetric_difference, max_element, min_element,
next_permutation, prev_permutation, find_first_of, find_end):
Document.
* include/bits/stl_algobase.h (copy,copy_backward): Clarify overlap
restrictions in docs.
* include/bits/stl_heap.h (push_heap, pop_heap, make_heap, sort_heap):
Document.
* docs/doxygen/doxygroups.cc (setoperations): New group.
From-SVN: r69387
2003-07-15 09:30:29 +02:00
|
|
|
/**
|
|
|
|
* @brief Sort a heap.
|
|
|
|
* @param first Start of heap.
|
|
|
|
* @param last End of heap.
|
|
|
|
* @ingroup heap
|
|
|
|
*
|
|
|
|
* This operation sorts the valid heap in the range [first,last).
|
|
|
|
*/
|
2001-07-18 19:09:02 +02:00
|
|
|
template<typename _RandomAccessIterator>
|
|
|
|
void
|
|
|
|
sort_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)
|
|
|
|
{
|
|
|
|
// concept requirements
|
2003-07-05 06:05:45 +02:00
|
|
|
__glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
|
2001-11-01 16:46:48 +01:00
|
|
|
_RandomAccessIterator>)
|
2003-07-05 06:05:45 +02:00
|
|
|
__glibcxx_function_requires(_LessThanComparableConcept<
|
2001-11-01 16:46:48 +01:00
|
|
|
typename iterator_traits<_RandomAccessIterator>::value_type>)
|
2003-11-11 21:09:16 +01:00
|
|
|
__glibcxx_requires_valid_range(__first, __last);
|
re PR libstdc++/21172 (potential integer overflow error in STL heap functions)
2007-02-12 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/21172
* include/bits/stl_heap.h (__adjust_heap(_RandomAccessIterator,
_Distance, _Distance, _Tp), __adjust_heap(_RandomAccessIterator,
_Distance, _Distance, _Tp, _Compare)): Avoid potential integer
overflow.
* include/bits/stl_heap.h (__is_heap(_RandomAccessIterator,
_RandomAccessIterator), __is_heap(_RandomAccessIterator,
_RandomAccessIterator, _StrictWeakOrdering): Mark inline.
(make_heap(_RandomAccessIterator, _RandomAccessIterator,
_Compare)): Do not mark inline.
* include/bits/stl_heap.h (push_heap(_RandomAccessIterator,
_RandomAccessIterator), sort_heap(_RandomAccessIterator,
_RandomAccessIterator)): Uncomment __glibcxx_requires_heap.
From-SVN: r121875
2007-02-13 01:25:30 +01:00
|
|
|
__glibcxx_requires_heap(__first, __last);
|
2001-07-18 19:09:02 +02:00
|
|
|
|
|
|
|
while (__last - __first > 1)
|
2006-09-10 11:23:59 +02:00
|
|
|
std::pop_heap(__first, _RandomAccessIterator(__last--));
|
2001-07-18 19:09:02 +02:00
|
|
|
}
|
|
|
|
|
stl_algo.h (includes, [...]): Document.
2003-07-15 Jerry Quinn <jlquinn@optonline.net>
* include/bits/stl_algo.h (includes, set_union, set_intersection,
set_difference, set_symmetric_difference, max_element, min_element,
next_permutation, prev_permutation, find_first_of, find_end):
Document.
* include/bits/stl_algobase.h (copy,copy_backward): Clarify overlap
restrictions in docs.
* include/bits/stl_heap.h (push_heap, pop_heap, make_heap, sort_heap):
Document.
* docs/doxygen/doxygroups.cc (setoperations): New group.
From-SVN: r69387
2003-07-15 09:30:29 +02:00
|
|
|
/**
|
|
|
|
* @brief Sort a heap using comparison functor.
|
|
|
|
* @param first Start of heap.
|
|
|
|
* @param last End of heap.
|
|
|
|
* @param comp Comparison functor to use.
|
|
|
|
* @ingroup heap
|
|
|
|
*
|
|
|
|
* This operation sorts the valid heap in the range [first,last).
|
|
|
|
* Comparisons are made using comp.
|
|
|
|
*/
|
2001-07-18 19:09:02 +02:00
|
|
|
template<typename _RandomAccessIterator, typename _Compare>
|
2004-02-08 05:46:42 +01:00
|
|
|
void
|
2001-07-18 19:09:02 +02:00
|
|
|
sort_heap(_RandomAccessIterator __first, _RandomAccessIterator __last,
|
|
|
|
_Compare __comp)
|
|
|
|
{
|
|
|
|
// concept requirements
|
2003-07-05 06:05:45 +02:00
|
|
|
__glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
|
2001-11-01 16:46:48 +01:00
|
|
|
_RandomAccessIterator>)
|
2003-11-11 21:09:16 +01:00
|
|
|
__glibcxx_requires_valid_range(__first, __last);
|
|
|
|
__glibcxx_requires_heap_pred(__first, __last, __comp);
|
2001-07-18 19:09:02 +02:00
|
|
|
|
|
|
|
while (__last - __first > 1)
|
2006-09-10 11:23:59 +02:00
|
|
|
std::pop_heap(__first, _RandomAccessIterator(__last--), __comp);
|
2001-07-18 19:09:02 +02:00
|
|
|
}
|
2000-10-05 13:27:02 +02:00
|
|
|
|
2005-12-19 01:56:05 +01:00
|
|
|
_GLIBCXX_END_NAMESPACE
|
2000-10-05 13:27:02 +02:00
|
|
|
|
2003-07-05 06:05:45 +02:00
|
|
|
#endif /* _STL_HEAP_H */
|