2005-05-27 17:01:45 +02:00
|
|
|
// Debugging support implementation -*- C++ -*-
|
|
|
|
|
re PR libstdc++/34730 (Legal program doesn't compile with -D_GLIBCXX_DEBUG)
2008-01-12 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/34730
* include/debug/functions.h (__check_sorted_set,
__check_sorted_set_aux): Add.
(__check_sorted): Check StrictWeakOrdering.
* include/debug/macros.h (__glibcxx_check_strict_weak_ordering,
__glibcxx_check_strict_weak_ordering_pred): Remove.
(__glibcxx_check_sorted, __glibcxx_check_sorted_pred): Adjust.
(__glibcxx_check_sorted_set, __glibcxx_check_sorted_set_pred): Add.
* include/debug/debug.h (__glibcxx_requires_sorted_set,
__glibcxx_requires_sorted_set_pred): Add.
* include/bits/stl_algo.h (merge, includes, set_union,
set_intersection, set_difference, set_symmetric_difference):
Adjust, use __glibcxx_requires_sorted_set* instead.
* testsuite/25_algorithms/set_intersection/34730.cc: New.
From-SVN: r131500
2008-01-13 02:34:58 +01:00
|
|
|
// Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008
|
2005-05-27 17:01:45 +02:00
|
|
|
// 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 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,
|
2005-05-27 17:01:45 +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.
|
|
|
|
|
2006-11-29 21:59:22 +01:00
|
|
|
/** @file debug/functions.h
|
|
|
|
* This file is a GNU debug extension to the Standard C++ Library.
|
|
|
|
*/
|
|
|
|
|
2005-05-27 17:01:45 +02:00
|
|
|
#ifndef _GLIBCXX_DEBUG_FUNCTIONS_H
|
|
|
|
#define _GLIBCXX_DEBUG_FUNCTIONS_H 1
|
|
|
|
|
2005-12-19 01:56:05 +01:00
|
|
|
#include <bits/c++config.h>
|
2007-03-03 17:06:59 +01:00
|
|
|
#include <cstddef> // for ptrdiff_t
|
2005-05-27 17:01:45 +02:00
|
|
|
#include <bits/stl_iterator_base_types.h> // for iterator_traits, categories
|
|
|
|
#include <bits/cpp_type_traits.h> // for __is_integer
|
|
|
|
|
|
|
|
namespace __gnu_debug
|
|
|
|
{
|
|
|
|
template<typename _Iterator, typename _Sequence>
|
|
|
|
class _Safe_iterator;
|
|
|
|
|
|
|
|
// An arbitrary iterator pointer is not singular.
|
|
|
|
inline bool
|
|
|
|
__check_singular_aux(const void*) { return false; }
|
|
|
|
|
|
|
|
// We may have an iterator that derives from _Safe_iterator_base but isn't
|
|
|
|
// a _Safe_iterator.
|
|
|
|
template<typename _Iterator>
|
|
|
|
inline bool
|
|
|
|
__check_singular(_Iterator& __x)
|
2005-12-19 01:56:05 +01:00
|
|
|
{ return __check_singular_aux(&__x); }
|
2005-05-27 17:01:45 +02:00
|
|
|
|
|
|
|
/** Non-NULL pointers are nonsingular. */
|
|
|
|
template<typename _Tp>
|
|
|
|
inline bool
|
|
|
|
__check_singular(const _Tp* __ptr)
|
|
|
|
{ return __ptr == 0; }
|
|
|
|
|
|
|
|
/** Safe iterators know if they are singular. */
|
|
|
|
template<typename _Iterator, typename _Sequence>
|
|
|
|
inline bool
|
|
|
|
__check_singular(const _Safe_iterator<_Iterator, _Sequence>& __x)
|
|
|
|
{ return __x._M_singular(); }
|
|
|
|
|
|
|
|
/** Assume that some arbitrary iterator is dereferenceable, because we
|
|
|
|
can't prove that it isn't. */
|
|
|
|
template<typename _Iterator>
|
|
|
|
inline bool
|
|
|
|
__check_dereferenceable(_Iterator&)
|
|
|
|
{ return true; }
|
|
|
|
|
|
|
|
/** Non-NULL pointers are dereferenceable. */
|
|
|
|
template<typename _Tp>
|
|
|
|
inline bool
|
|
|
|
__check_dereferenceable(const _Tp* __ptr)
|
|
|
|
{ return __ptr; }
|
|
|
|
|
|
|
|
/** Safe iterators know if they are singular. */
|
|
|
|
template<typename _Iterator, typename _Sequence>
|
|
|
|
inline bool
|
|
|
|
__check_dereferenceable(const _Safe_iterator<_Iterator, _Sequence>& __x)
|
|
|
|
{ return __x._M_dereferenceable(); }
|
|
|
|
|
|
|
|
/** If the distance between two random access iterators is
|
|
|
|
* nonnegative, assume the range is valid.
|
|
|
|
*/
|
|
|
|
template<typename _RandomAccessIterator>
|
|
|
|
inline bool
|
|
|
|
__valid_range_aux2(const _RandomAccessIterator& __first,
|
|
|
|
const _RandomAccessIterator& __last,
|
|
|
|
std::random_access_iterator_tag)
|
|
|
|
{ return __last - __first >= 0; }
|
|
|
|
|
|
|
|
/** Can't test for a valid range with input iterators, because
|
|
|
|
* iteration may be destructive. So we just assume that the range
|
|
|
|
* is valid.
|
|
|
|
*/
|
|
|
|
template<typename _InputIterator>
|
|
|
|
inline bool
|
|
|
|
__valid_range_aux2(const _InputIterator&, const _InputIterator&,
|
|
|
|
std::input_iterator_tag)
|
|
|
|
{ return true; }
|
|
|
|
|
|
|
|
/** We say that integral types for a valid range, and defer to other
|
|
|
|
* routines to realize what to do with integral types instead of
|
|
|
|
* iterators.
|
|
|
|
*/
|
|
|
|
template<typename _Integral>
|
|
|
|
inline bool
|
2006-11-29 21:59:22 +01:00
|
|
|
__valid_range_aux(const _Integral&, const _Integral&, std::__true_type)
|
2005-05-27 17:01:45 +02:00
|
|
|
{ return true; }
|
|
|
|
|
|
|
|
/** We have iterators, so figure out what kind of iterators that are
|
|
|
|
* to see if we can check the range ahead of time.
|
|
|
|
*/
|
|
|
|
template<typename _InputIterator>
|
|
|
|
inline bool
|
|
|
|
__valid_range_aux(const _InputIterator& __first,
|
2006-11-29 21:59:22 +01:00
|
|
|
const _InputIterator& __last, std::__false_type)
|
2005-05-27 17:01:45 +02:00
|
|
|
{
|
|
|
|
typedef typename std::iterator_traits<_InputIterator>::iterator_category
|
|
|
|
_Category;
|
2005-12-19 01:56:05 +01:00
|
|
|
return __valid_range_aux2(__first, __last, _Category());
|
2005-05-27 17:01:45 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/** Don't know what these iterators are, or if they are even
|
|
|
|
* iterators (we may get an integral type for InputIterator), so
|
|
|
|
* see if they are integral and pass them on to the next phase
|
|
|
|
* otherwise.
|
|
|
|
*/
|
|
|
|
template<typename _InputIterator>
|
|
|
|
inline bool
|
|
|
|
__valid_range(const _InputIterator& __first, const _InputIterator& __last)
|
|
|
|
{
|
|
|
|
typedef typename std::__is_integer<_InputIterator>::__type _Integral;
|
2005-12-19 01:56:05 +01:00
|
|
|
return __valid_range_aux(__first, __last, _Integral());
|
2005-05-27 17:01:45 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/** Safe iterators know how to check if they form a valid range. */
|
|
|
|
template<typename _Iterator, typename _Sequence>
|
|
|
|
inline bool
|
|
|
|
__valid_range(const _Safe_iterator<_Iterator, _Sequence>& __first,
|
|
|
|
const _Safe_iterator<_Iterator, _Sequence>& __last)
|
|
|
|
{ return __first._M_valid_range(__last); }
|
|
|
|
|
|
|
|
/* Checks that [first, last) is a valid range, and then returns
|
|
|
|
* __first. This routine is useful when we can't use a separate
|
|
|
|
* assertion statement because, e.g., we are in a constructor.
|
|
|
|
*/
|
|
|
|
template<typename _InputIterator>
|
|
|
|
inline _InputIterator
|
|
|
|
__check_valid_range(const _InputIterator& __first,
|
mt_allocator.h (__mt_alloc::__mt_alloc): Remove name of unused parameter.
2005-12-26 Chris Jefferson <chris@bubblescope.net>
* include/ext/mt_allocator.h (__mt_alloc::__mt_alloc): Remove
name of unused parameter.
* include/bits/stream_iterator.h (istream_iterator::istream_iterator):
Construct _M_value.
* include/debug/functions.h (__check_valid_range): Add
__attribute__((unused)).
* include/tr1/hashtable (hashtable::end): Remove name of unused
parameter.
* include/tr1/tuple_iterate.h (tuple::tuple): Likewise.
(tuple::operator=): Add __attribute__((unused)).
* include/tr1/functional (Fnv_hash<4>::hash): Add static_cast.
(Fnv_hash<8>::hash): Likewise.
* testsuite/25_algorithms/iter_swap/20577.cc (swap): Remove name of
unused parameter.
* testsuite/25_algorithms/unique_copy/check_type.cc (S2::S2,X2::X2):
Likewise.
* testsuite/22_locale/ctype/narrow/char/19955.cc (do_narrow): Likewise.
* testsuite/22_locale/ctype/is/char/9858.cc (Derived::do_is,
Derived::do_scan_is, Derived::do_scan_not, Derived2::do_is,
Derived2::do_scan_is, Derived2::do_scan_not): Likewise.
* testsuite/22_locale/time_put/put/wchar_t/12439_1.cc (TP::do_put):
Likewise.
* testsuite/22_locale/time_put/put/wchar_t/12439_3.cc (TP::do_put):
Likewise.
* testsuite/22_locale/time_put/put/char/12439_1.cc (TP::do_put):
Likewise.
* testsuite/22_locale/time_put/put/char/12439_3.cc (TP::do_put):
Likewise.
* testsuite/testsuite_io.h (fail_num_get::do_get, fail_num_put::do_put):
Likewise.
* testsuite/25_algorithms/find/17441.cc (find): Likewise.
* testsuite/23_containers/vector/cons/clear_allocator.cc
(clear_alloc::clear_alloc): Likewise.
* testsuite/23_containers/vector/bool/clear_allocator.cc
(clear_alloc::clear_alloc): Likewise.
* testsuite/23_containers/list/cons/clear_allocator.cc
(clear_alloc::clear_alloc): Likewise.
* testsuite/23_containers/set/modifiers/16728.cc (test_container):
Likewise.
* testsuite/27_io/basic_ios/cons/char/3.cc (char_traits::to_char_type,
to_int_type): Likewise.
* testsuite/27_io/basic_filebuf/imbue/12206.cc (codecvt::do_out, do_in,
do_unshift, do_length): Likewise.
* testsuite/21_strings/basic_string/capacity/1.cc
(operator==(A<T>,A<T>), operator<(A<T>,A<T>),
char_traits::to_char_type, char_traits::to_int_type): Likewise
* testsuite/testsuite_character.h (ctype::do_is, ctype::do_scan_is,
ctype::do_scan_not, do_toupper, do_tolower): Likewise.
* testsuite/25_algorithms/replace_copy/check_type.cc (Z::operator=):
Add missing return statement.
* testsuite/25_algorithms/replace_copy_if/check_type.cc (Z::operator=):
Likewise.
* testsuite/testsuite_iterators.h (output_iterator_wrapper::operator=,
random_access_iterator_wrapper::operator==): Likewise.
* testsuite/20_util/functional/binders/1.cc (s::f_int_int_const,
s::f_int_int, s::f_int_void_const, s::f_int_void): Likewise.
* testsuite/27_io/types/1.cc (test01): Likewise.
* testsuite/27_io/basic_ostream/write/wchar_t/1.cc (test01): Likewise.
* testsuite/27_io/basic_ostream/write/char/1.cc (test01): Likewise.
* testsuite/21_strings/c_strings/wchar_t/24559.cc (main): Likewise.
* testsuite/27_io/basic_istream/ignore/wchar_t/2.cc (check): Add static
cast.
* testsuite/27_io/basic_istream/ignore/char/2.cc (check): Likewise.
* testsuite/27_io/basic_istream/getline/wchar_t/5.cc (check): Likewise.
* testsuite/27_io/basic_istream/getline/char/5.cc (check): Likewise.
* testsuite/testsuite_allocator.h (check_new): Likewise.
(check_deallocate_null): Add missing return value.
* testsuite/ext/pool_allocator/allocate_chunk.cc (test01):
Make variable unsigned.
* testsuite/23_containers/vector/modifiers/erase/1.cc (N,N1,N2,N3,N4,
N5,test01): Likewise.
* testsuite/26_numerics/valarray/valarray_subset_assignment.cc
(check_array): Likewise.
(main): Removed unused variable.
* testsuite/27_io/basic_streambuf/in_avail/wchar_t/1.cc (test05):
Removed unused variable.
* testsuite/27_io/basic_ostream/flush/wchar_t/1.cc (test01): Likewise.
* testsuite/27_io/basic_ostream/flush/char/1.cc (test01): Likewise.
* testsuite/27_io/basic_ostream/endl/wchar_t/1.cc (test01): Likewise.
* testsuite/27_io/basic_ostream/endl/char/1.cc (test01): Likewise.
* testsuite/27_io/basic_ostream/ends/wchar_t/1.cc (test01): Likewise.
* testsuite/27_io/basic_ostream/ends/char/1.cc (test01): Likewise.
* testsuite/tr1/2_general_utilities/memory/shared_ptr/
assign/shared_ptr.cc (test01): Correct return type.
* testsuite/27_io/basic_filebuf/close/char/2.cc (test_02):
Add default value to close_num.
From-SVN: r109062
2005-12-26 11:53:42 +01:00
|
|
|
const _InputIterator& __last
|
|
|
|
__attribute__((__unused__)))
|
2005-05-27 17:01:45 +02:00
|
|
|
{
|
2005-12-19 01:56:05 +01:00
|
|
|
_GLIBCXX_DEBUG_ASSERT(__valid_range(__first, __last));
|
2005-05-27 17:01:45 +02:00
|
|
|
return __first;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Checks that __s is non-NULL or __n == 0, and then returns __s. */
|
|
|
|
template<typename _CharT, typename _Integer>
|
|
|
|
inline const _CharT*
|
mt_allocator.h (__mt_alloc::__mt_alloc): Remove name of unused parameter.
2005-12-26 Chris Jefferson <chris@bubblescope.net>
* include/ext/mt_allocator.h (__mt_alloc::__mt_alloc): Remove
name of unused parameter.
* include/bits/stream_iterator.h (istream_iterator::istream_iterator):
Construct _M_value.
* include/debug/functions.h (__check_valid_range): Add
__attribute__((unused)).
* include/tr1/hashtable (hashtable::end): Remove name of unused
parameter.
* include/tr1/tuple_iterate.h (tuple::tuple): Likewise.
(tuple::operator=): Add __attribute__((unused)).
* include/tr1/functional (Fnv_hash<4>::hash): Add static_cast.
(Fnv_hash<8>::hash): Likewise.
* testsuite/25_algorithms/iter_swap/20577.cc (swap): Remove name of
unused parameter.
* testsuite/25_algorithms/unique_copy/check_type.cc (S2::S2,X2::X2):
Likewise.
* testsuite/22_locale/ctype/narrow/char/19955.cc (do_narrow): Likewise.
* testsuite/22_locale/ctype/is/char/9858.cc (Derived::do_is,
Derived::do_scan_is, Derived::do_scan_not, Derived2::do_is,
Derived2::do_scan_is, Derived2::do_scan_not): Likewise.
* testsuite/22_locale/time_put/put/wchar_t/12439_1.cc (TP::do_put):
Likewise.
* testsuite/22_locale/time_put/put/wchar_t/12439_3.cc (TP::do_put):
Likewise.
* testsuite/22_locale/time_put/put/char/12439_1.cc (TP::do_put):
Likewise.
* testsuite/22_locale/time_put/put/char/12439_3.cc (TP::do_put):
Likewise.
* testsuite/testsuite_io.h (fail_num_get::do_get, fail_num_put::do_put):
Likewise.
* testsuite/25_algorithms/find/17441.cc (find): Likewise.
* testsuite/23_containers/vector/cons/clear_allocator.cc
(clear_alloc::clear_alloc): Likewise.
* testsuite/23_containers/vector/bool/clear_allocator.cc
(clear_alloc::clear_alloc): Likewise.
* testsuite/23_containers/list/cons/clear_allocator.cc
(clear_alloc::clear_alloc): Likewise.
* testsuite/23_containers/set/modifiers/16728.cc (test_container):
Likewise.
* testsuite/27_io/basic_ios/cons/char/3.cc (char_traits::to_char_type,
to_int_type): Likewise.
* testsuite/27_io/basic_filebuf/imbue/12206.cc (codecvt::do_out, do_in,
do_unshift, do_length): Likewise.
* testsuite/21_strings/basic_string/capacity/1.cc
(operator==(A<T>,A<T>), operator<(A<T>,A<T>),
char_traits::to_char_type, char_traits::to_int_type): Likewise
* testsuite/testsuite_character.h (ctype::do_is, ctype::do_scan_is,
ctype::do_scan_not, do_toupper, do_tolower): Likewise.
* testsuite/25_algorithms/replace_copy/check_type.cc (Z::operator=):
Add missing return statement.
* testsuite/25_algorithms/replace_copy_if/check_type.cc (Z::operator=):
Likewise.
* testsuite/testsuite_iterators.h (output_iterator_wrapper::operator=,
random_access_iterator_wrapper::operator==): Likewise.
* testsuite/20_util/functional/binders/1.cc (s::f_int_int_const,
s::f_int_int, s::f_int_void_const, s::f_int_void): Likewise.
* testsuite/27_io/types/1.cc (test01): Likewise.
* testsuite/27_io/basic_ostream/write/wchar_t/1.cc (test01): Likewise.
* testsuite/27_io/basic_ostream/write/char/1.cc (test01): Likewise.
* testsuite/21_strings/c_strings/wchar_t/24559.cc (main): Likewise.
* testsuite/27_io/basic_istream/ignore/wchar_t/2.cc (check): Add static
cast.
* testsuite/27_io/basic_istream/ignore/char/2.cc (check): Likewise.
* testsuite/27_io/basic_istream/getline/wchar_t/5.cc (check): Likewise.
* testsuite/27_io/basic_istream/getline/char/5.cc (check): Likewise.
* testsuite/testsuite_allocator.h (check_new): Likewise.
(check_deallocate_null): Add missing return value.
* testsuite/ext/pool_allocator/allocate_chunk.cc (test01):
Make variable unsigned.
* testsuite/23_containers/vector/modifiers/erase/1.cc (N,N1,N2,N3,N4,
N5,test01): Likewise.
* testsuite/26_numerics/valarray/valarray_subset_assignment.cc
(check_array): Likewise.
(main): Removed unused variable.
* testsuite/27_io/basic_streambuf/in_avail/wchar_t/1.cc (test05):
Removed unused variable.
* testsuite/27_io/basic_ostream/flush/wchar_t/1.cc (test01): Likewise.
* testsuite/27_io/basic_ostream/flush/char/1.cc (test01): Likewise.
* testsuite/27_io/basic_ostream/endl/wchar_t/1.cc (test01): Likewise.
* testsuite/27_io/basic_ostream/endl/char/1.cc (test01): Likewise.
* testsuite/27_io/basic_ostream/ends/wchar_t/1.cc (test01): Likewise.
* testsuite/27_io/basic_ostream/ends/char/1.cc (test01): Likewise.
* testsuite/tr1/2_general_utilities/memory/shared_ptr/
assign/shared_ptr.cc (test01): Correct return type.
* testsuite/27_io/basic_filebuf/close/char/2.cc (test_02):
Add default value to close_num.
From-SVN: r109062
2005-12-26 11:53:42 +01:00
|
|
|
__check_string(const _CharT* __s,
|
|
|
|
const _Integer& __n __attribute__((__unused__)))
|
2005-05-27 17:01:45 +02:00
|
|
|
{
|
|
|
|
#ifdef _GLIBCXX_DEBUG_PEDANTIC
|
|
|
|
_GLIBCXX_DEBUG_ASSERT(__s != 0 || __n == 0);
|
|
|
|
#endif
|
|
|
|
return __s;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Checks that __s is non-NULL and then returns __s. */
|
|
|
|
template<typename _CharT>
|
|
|
|
inline const _CharT*
|
|
|
|
__check_string(const _CharT* __s)
|
|
|
|
{
|
|
|
|
#ifdef _GLIBCXX_DEBUG_PEDANTIC
|
|
|
|
_GLIBCXX_DEBUG_ASSERT(__s != 0);
|
|
|
|
#endif
|
|
|
|
return __s;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Can't check if an input iterator sequence is sorted, because we
|
|
|
|
// can't step through the sequence.
|
|
|
|
template<typename _InputIterator>
|
|
|
|
inline bool
|
|
|
|
__check_sorted_aux(const _InputIterator&, const _InputIterator&,
|
|
|
|
std::input_iterator_tag)
|
|
|
|
{ return true; }
|
|
|
|
|
|
|
|
// Can verify if a forward iterator sequence is in fact sorted using
|
|
|
|
// std::__is_sorted
|
|
|
|
template<typename _ForwardIterator>
|
|
|
|
inline bool
|
|
|
|
__check_sorted_aux(_ForwardIterator __first, _ForwardIterator __last,
|
|
|
|
std::forward_iterator_tag)
|
|
|
|
{
|
|
|
|
if (__first == __last)
|
|
|
|
return true;
|
|
|
|
|
|
|
|
_ForwardIterator __next = __first;
|
re PR libstdc++/34730 (Legal program doesn't compile with -D_GLIBCXX_DEBUG)
2008-01-12 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/34730
* include/debug/functions.h (__check_sorted_set,
__check_sorted_set_aux): Add.
(__check_sorted): Check StrictWeakOrdering.
* include/debug/macros.h (__glibcxx_check_strict_weak_ordering,
__glibcxx_check_strict_weak_ordering_pred): Remove.
(__glibcxx_check_sorted, __glibcxx_check_sorted_pred): Adjust.
(__glibcxx_check_sorted_set, __glibcxx_check_sorted_set_pred): Add.
* include/debug/debug.h (__glibcxx_requires_sorted_set,
__glibcxx_requires_sorted_set_pred): Add.
* include/bits/stl_algo.h (merge, includes, set_union,
set_intersection, set_difference, set_symmetric_difference):
Adjust, use __glibcxx_requires_sorted_set* instead.
* testsuite/25_algorithms/set_intersection/34730.cc: New.
From-SVN: r131500
2008-01-13 02:34:58 +01:00
|
|
|
for (++__next; __next != __last; __first = __next, ++__next)
|
2005-05-27 17:01:45 +02:00
|
|
|
if (*__next < *__first)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Can't check if an input iterator sequence is sorted, because we can't step
|
|
|
|
// through the sequence.
|
|
|
|
template<typename _InputIterator, typename _Predicate>
|
|
|
|
inline bool
|
|
|
|
__check_sorted_aux(const _InputIterator&, const _InputIterator&,
|
|
|
|
_Predicate, std::input_iterator_tag)
|
|
|
|
{ return true; }
|
|
|
|
|
|
|
|
// Can verify if a forward iterator sequence is in fact sorted using
|
|
|
|
// std::__is_sorted
|
|
|
|
template<typename _ForwardIterator, typename _Predicate>
|
|
|
|
inline bool
|
|
|
|
__check_sorted_aux(_ForwardIterator __first, _ForwardIterator __last,
|
|
|
|
_Predicate __pred, std::forward_iterator_tag)
|
|
|
|
{
|
|
|
|
if (__first == __last)
|
|
|
|
return true;
|
|
|
|
|
|
|
|
_ForwardIterator __next = __first;
|
re PR libstdc++/34730 (Legal program doesn't compile with -D_GLIBCXX_DEBUG)
2008-01-12 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/34730
* include/debug/functions.h (__check_sorted_set,
__check_sorted_set_aux): Add.
(__check_sorted): Check StrictWeakOrdering.
* include/debug/macros.h (__glibcxx_check_strict_weak_ordering,
__glibcxx_check_strict_weak_ordering_pred): Remove.
(__glibcxx_check_sorted, __glibcxx_check_sorted_pred): Adjust.
(__glibcxx_check_sorted_set, __glibcxx_check_sorted_set_pred): Add.
* include/debug/debug.h (__glibcxx_requires_sorted_set,
__glibcxx_requires_sorted_set_pred): Add.
* include/bits/stl_algo.h (merge, includes, set_union,
set_intersection, set_difference, set_symmetric_difference):
Adjust, use __glibcxx_requires_sorted_set* instead.
* testsuite/25_algorithms/set_intersection/34730.cc: New.
From-SVN: r131500
2008-01-13 02:34:58 +01:00
|
|
|
for (++__next; __next != __last; __first = __next, ++__next)
|
2005-05-27 17:01:45 +02:00
|
|
|
if (__pred(*__next, *__first))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Determine if a sequence is sorted.
|
|
|
|
template<typename _InputIterator>
|
|
|
|
inline bool
|
|
|
|
__check_sorted(const _InputIterator& __first, const _InputIterator& __last)
|
|
|
|
{
|
|
|
|
typedef typename std::iterator_traits<_InputIterator>::iterator_category
|
|
|
|
_Category;
|
re PR libstdc++/34730 (Legal program doesn't compile with -D_GLIBCXX_DEBUG)
2008-01-12 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/34730
* include/debug/functions.h (__check_sorted_set,
__check_sorted_set_aux): Add.
(__check_sorted): Check StrictWeakOrdering.
* include/debug/macros.h (__glibcxx_check_strict_weak_ordering,
__glibcxx_check_strict_weak_ordering_pred): Remove.
(__glibcxx_check_sorted, __glibcxx_check_sorted_pred): Adjust.
(__glibcxx_check_sorted_set, __glibcxx_check_sorted_set_pred): Add.
* include/debug/debug.h (__glibcxx_requires_sorted_set,
__glibcxx_requires_sorted_set_pred): Add.
* include/bits/stl_algo.h (merge, includes, set_union,
set_intersection, set_difference, set_symmetric_difference):
Adjust, use __glibcxx_requires_sorted_set* instead.
* testsuite/25_algorithms/set_intersection/34730.cc: New.
From-SVN: r131500
2008-01-13 02:34:58 +01:00
|
|
|
|
|
|
|
// Verify that the < operator for elements in the sequence is a
|
|
|
|
// StrictWeakOrdering by checking that it is irreflexive.
|
|
|
|
_GLIBCXX_DEBUG_ASSERT(__first == __last || !(*__first < *__first));
|
|
|
|
|
2005-12-19 01:56:05 +01:00
|
|
|
return __check_sorted_aux(__first, __last, _Category());
|
2005-05-27 17:01:45 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
template<typename _InputIterator, typename _Predicate>
|
|
|
|
inline bool
|
|
|
|
__check_sorted(const _InputIterator& __first, const _InputIterator& __last,
|
|
|
|
_Predicate __pred)
|
|
|
|
{
|
|
|
|
typedef typename std::iterator_traits<_InputIterator>::iterator_category
|
|
|
|
_Category;
|
re PR libstdc++/34730 (Legal program doesn't compile with -D_GLIBCXX_DEBUG)
2008-01-12 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/34730
* include/debug/functions.h (__check_sorted_set,
__check_sorted_set_aux): Add.
(__check_sorted): Check StrictWeakOrdering.
* include/debug/macros.h (__glibcxx_check_strict_weak_ordering,
__glibcxx_check_strict_weak_ordering_pred): Remove.
(__glibcxx_check_sorted, __glibcxx_check_sorted_pred): Adjust.
(__glibcxx_check_sorted_set, __glibcxx_check_sorted_set_pred): Add.
* include/debug/debug.h (__glibcxx_requires_sorted_set,
__glibcxx_requires_sorted_set_pred): Add.
* include/bits/stl_algo.h (merge, includes, set_union,
set_intersection, set_difference, set_symmetric_difference):
Adjust, use __glibcxx_requires_sorted_set* instead.
* testsuite/25_algorithms/set_intersection/34730.cc: New.
From-SVN: r131500
2008-01-13 02:34:58 +01:00
|
|
|
|
|
|
|
// Verify that the predicate is StrictWeakOrdering by checking that it
|
|
|
|
// is irreflexive.
|
|
|
|
_GLIBCXX_DEBUG_ASSERT(__first == __last || !__pred(*__first, *__first));
|
|
|
|
|
|
|
|
return __check_sorted_aux(__first, __last, __pred, _Category());
|
|
|
|
}
|
|
|
|
|
|
|
|
template<typename _InputIterator1, typename _InputIterator2>
|
|
|
|
inline bool
|
|
|
|
__check_sorted_set_aux(const _InputIterator1& __first,
|
|
|
|
const _InputIterator1& __last,
|
|
|
|
const _InputIterator2&, std::__true_type)
|
|
|
|
{ return __check_sorted(__first, __last); }
|
|
|
|
|
|
|
|
template<typename _InputIterator1, typename _InputIterator2>
|
|
|
|
inline bool
|
|
|
|
__check_sorted_set_aux(const _InputIterator1&,
|
|
|
|
const _InputIterator1&,
|
|
|
|
const _InputIterator2&, std::__false_type)
|
|
|
|
{ return true; }
|
|
|
|
|
|
|
|
template<typename _InputIterator1, typename _InputIterator2,
|
|
|
|
typename _Predicate>
|
|
|
|
inline bool
|
|
|
|
__check_sorted_set_aux(const _InputIterator1& __first,
|
|
|
|
const _InputIterator1& __last,
|
|
|
|
const _InputIterator2&, _Predicate __pred,
|
|
|
|
std::__true_type)
|
|
|
|
{ return __check_sorted(__first, __last, __pred); }
|
|
|
|
|
|
|
|
template<typename _InputIterator1, typename _InputIterator2,
|
|
|
|
typename _Predicate>
|
|
|
|
inline bool
|
|
|
|
__check_sorted_set_aux(const _InputIterator1&,
|
|
|
|
const _InputIterator1&,
|
|
|
|
const _InputIterator2&, _Predicate,
|
|
|
|
std::__false_type)
|
|
|
|
{ return true; }
|
|
|
|
|
|
|
|
// ... special variant used in std::merge, std::includes, std::set_*.
|
|
|
|
template<typename _InputIterator1, typename _InputIterator2>
|
|
|
|
inline bool
|
|
|
|
__check_sorted_set(const _InputIterator1& __first,
|
|
|
|
const _InputIterator1& __last,
|
|
|
|
const _InputIterator2&)
|
|
|
|
{
|
|
|
|
typedef typename std::iterator_traits<_InputIterator1>::value_type
|
|
|
|
_ValueType1;
|
|
|
|
typedef typename std::iterator_traits<_InputIterator2>::value_type
|
|
|
|
_ValueType2;
|
|
|
|
|
|
|
|
typedef typename std::__are_same<_ValueType1, _ValueType2>::__type
|
|
|
|
_SameType;
|
|
|
|
return __check_sorted_set_aux(__first, __last, _SameType());
|
2005-05-27 17:01:45 +02:00
|
|
|
}
|
|
|
|
|
re PR libstdc++/34730 (Legal program doesn't compile with -D_GLIBCXX_DEBUG)
2008-01-12 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/34730
* include/debug/functions.h (__check_sorted_set,
__check_sorted_set_aux): Add.
(__check_sorted): Check StrictWeakOrdering.
* include/debug/macros.h (__glibcxx_check_strict_weak_ordering,
__glibcxx_check_strict_weak_ordering_pred): Remove.
(__glibcxx_check_sorted, __glibcxx_check_sorted_pred): Adjust.
(__glibcxx_check_sorted_set, __glibcxx_check_sorted_set_pred): Add.
* include/debug/debug.h (__glibcxx_requires_sorted_set,
__glibcxx_requires_sorted_set_pred): Add.
* include/bits/stl_algo.h (merge, includes, set_union,
set_intersection, set_difference, set_symmetric_difference):
Adjust, use __glibcxx_requires_sorted_set* instead.
* testsuite/25_algorithms/set_intersection/34730.cc: New.
From-SVN: r131500
2008-01-13 02:34:58 +01:00
|
|
|
template<typename _InputIterator1, typename _InputIterator2,
|
|
|
|
typename _Predicate>
|
|
|
|
inline bool
|
|
|
|
__check_sorted_set(const _InputIterator1& __first,
|
|
|
|
const _InputIterator1& __last,
|
|
|
|
const _InputIterator2&, _Predicate __pred)
|
|
|
|
{
|
|
|
|
typedef typename std::iterator_traits<_InputIterator1>::value_type
|
|
|
|
_ValueType1;
|
|
|
|
typedef typename std::iterator_traits<_InputIterator2>::value_type
|
|
|
|
_ValueType2;
|
|
|
|
|
|
|
|
typedef typename std::__are_same<_ValueType1, _ValueType2>::__type
|
|
|
|
_SameType;
|
|
|
|
return __check_sorted_set_aux(__first, __last, __pred, _SameType());
|
|
|
|
}
|
|
|
|
|
2005-05-27 17:01:45 +02:00
|
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
|
|
// 270. Binary search requirements overly strict
|
|
|
|
// Determine if a sequence is partitioned w.r.t. this element.
|
|
|
|
template<typename _ForwardIterator, typename _Tp>
|
|
|
|
inline bool
|
2007-10-03 02:34:40 +02:00
|
|
|
__check_partitioned_lower(_ForwardIterator __first,
|
|
|
|
_ForwardIterator __last, const _Tp& __value)
|
2005-05-27 17:01:45 +02:00
|
|
|
{
|
|
|
|
while (__first != __last && *__first < __value)
|
|
|
|
++__first;
|
|
|
|
while (__first != __last && !(*__first < __value))
|
|
|
|
++__first;
|
|
|
|
return __first == __last;
|
|
|
|
}
|
|
|
|
|
2007-10-03 02:34:40 +02:00
|
|
|
template<typename _ForwardIterator, typename _Tp>
|
|
|
|
inline bool
|
|
|
|
__check_partitioned_upper(_ForwardIterator __first,
|
|
|
|
_ForwardIterator __last, const _Tp& __value)
|
|
|
|
{
|
|
|
|
while (__first != __last && !(__value < *__first))
|
|
|
|
++__first;
|
|
|
|
while (__first != __last && __value < *__first)
|
|
|
|
++__first;
|
|
|
|
return __first == __last;
|
|
|
|
}
|
|
|
|
|
2005-05-27 17:01:45 +02:00
|
|
|
// Determine if a sequence is partitioned w.r.t. this element.
|
|
|
|
template<typename _ForwardIterator, typename _Tp, typename _Pred>
|
|
|
|
inline bool
|
2007-10-03 02:34:40 +02:00
|
|
|
__check_partitioned_lower(_ForwardIterator __first,
|
|
|
|
_ForwardIterator __last, const _Tp& __value,
|
|
|
|
_Pred __pred)
|
|
|
|
{
|
|
|
|
while (__first != __last && bool(__pred(*__first, __value)))
|
|
|
|
++__first;
|
|
|
|
while (__first != __last && !bool(__pred(*__first, __value)))
|
|
|
|
++__first;
|
|
|
|
return __first == __last;
|
|
|
|
}
|
|
|
|
|
|
|
|
template<typename _ForwardIterator, typename _Tp, typename _Pred>
|
|
|
|
inline bool
|
|
|
|
__check_partitioned_upper(_ForwardIterator __first,
|
|
|
|
_ForwardIterator __last, const _Tp& __value,
|
|
|
|
_Pred __pred)
|
2005-05-27 17:01:45 +02:00
|
|
|
{
|
2007-10-03 02:34:40 +02:00
|
|
|
while (__first != __last && !bool(__pred(__value, *__first)))
|
2005-05-27 17:01:45 +02:00
|
|
|
++__first;
|
2007-10-03 02:34:40 +02:00
|
|
|
while (__first != __last && bool(__pred(__value, *__first)))
|
2005-05-27 17:01:45 +02:00
|
|
|
++__first;
|
|
|
|
return __first == __last;
|
|
|
|
}
|
|
|
|
} // namespace __gnu_debug
|
|
|
|
|
|
|
|
#endif
|