2007-11-21 17:37:26 +01:00
|
|
|
// Core algorithmic facilities -*- C++ -*-
|
2001-06-27 19:09:53 +02:00
|
|
|
|
PR libstdc++/36104 part four
2011-01-30 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/36104 part four
* include/bits/c++config (_GLIBCXX_STD): Remove.
(_GLIBCXX_STD_D, _GLIBCXX_PR): Now _GLIBCXX_STD_C.
(_GLIBCXX_P): Now _GLIBCXX_STD_A.
(_GLIBCXX_NAMESPACE_DEBUG, _GLIBCXX_NAMESPACE_PARALLEL,
_GLIBCXX_NAMESPACE_PROFILE, _GLIBCXX_NAMESPACE_VERSION): Remove.
(_GLIBCXX_INLINE_DEBUG, _GLIBCXX_INLINE_PARALLEL,
_GLIBCXX_INLINE_PROFILE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE(X)): Remove.
(_GLIBCXX_END_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NESTED_NAMESPACE(X, Y)): Remove.
(_GLIBCXX_END_NESTED_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE_ALGO): Add.
(_GLIBCXX_END_NAMESPACE_ALGO): Add.
(_GLIBCXX_BEGIN_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_END_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_BEGIN_NAMESPACE_VERSION): Add.
(_GLIBCXX_END_NAMESPACE_VERSION): Add.
(_GLIBCXX_BEGIN_LDBL_NAMESPACE): To _GLIBCXX_BEGIN_NAMESPACE_LDBL.
(_GLIBCXX_END_LDBL_NAMESPACE): To _GLIBCXX_END_NAMESPACE_LDBL.
(_GLIBCXX_VISIBILITY_ATTR): Revert to _GLIBCXX_VISIBILITY.
* include/*: Use new macros for namespace scope.
* config/*: Same.
* src/*: Same.
* src/Makefile.am (sources): Remove debug_list.cc, add
compatibility-debug_list-2.cc.
(parallel_sources): Remove parallel_list.cc, add
compatibility-parallel_list-2.cc.
(compatibility-parallel_list-2.[o,lo]): New rule.
* src/Makefile.in: Regenerate.
* src/debug_list.cc: Remove.
* src/parallel_list.cc: Remove.
* src/compatibility-list-2.cc: New.
* src/compatibility-debug_list-2.cc: New.
* src/compatibility-parallel_list-2.cc: New.
* doc/doxygen/user.cfg.in: Adjust macros.
* testsuite/20_util/auto_ptr/assign_neg.cc: Adjust line numbers, macros.
* testsuite/20_util/declval/requirements/1_neg.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg1.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg2.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg3.cc: Same.
* testsuite/20_util/forward/c_neg.cc: Same.
* testsuite/20_util/forward/f_neg.cc: Same.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Same.
* testsuite/20_util/ratio/operations/ops_overflow_neg.cc: Same.
* testsuite/20_util/shared_ptr/cons/43820_neg.cc: Same.
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/forward_list/capacity/1.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
assign_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
insert_neg.cc: Same.
* testsuite/23_containers/list/capacity/29134.cc: Same.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/vector/bool/capacity/29134.cc: Same.
* testsuite/23_containers/vector/bool/modifiers/insert/31370.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: Same.
* testsuite/25_algorithms/sort/35588.cc: Same.
* testsuite/27_io/ios_base/cons/assign_neg.cc: Same.
* testsuite/27_io/ios_base/cons/copy_neg.cc: Same.
* testsuite/ext/profile/mutex_extensions_neg.cc: Same.
* testsuite/ext/profile/profiler_algos.cc: Same.
* testsuite/ext/type_traits/add_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/add_unsigned_integer_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_integer_neg.cc: Same.
* testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc: Same.
From-SVN: r169421
2011-01-30 23:39:36 +01:00
|
|
|
// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
|
|
|
|
// 2011 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
|
2009-04-09 17:00:19 +02:00
|
|
|
// Free Software Foundation; either version 3, or (at your option)
|
2001-06-27 19:09:53 +02:00
|
|
|
// 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.
|
|
|
|
|
2009-04-09 17:00:19 +02:00
|
|
|
// Under Section 7 of GPL version 3, you are granted additional
|
|
|
|
// permissions described in the GCC Runtime Library Exception, version
|
|
|
|
// 3.1, as published by the Free Software Foundation.
|
2001-06-27 19:09:53 +02:00
|
|
|
|
2009-04-09 17:00:19 +02:00
|
|
|
// You should have received a copy of the GNU General Public License and
|
|
|
|
// a copy of the GCC Runtime Library Exception along with this program;
|
|
|
|
// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
|
|
// <http://www.gnu.org/licenses/>.
|
2001-06-27 19:09:53 +02:00
|
|
|
|
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) 1996-1998
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
2010-12-19 10:21:16 +01:00
|
|
|
/** @file bits/stl_algobase.h
|
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
|
|
|
* This is an internal header file, included by other library headers.
|
2010-12-19 10:21:16 +01:00
|
|
|
* Do not attempt to use it directly. @headername{algorithm}
|
2000-10-05 13:27:02 +02:00
|
|
|
*/
|
|
|
|
|
2007-06-18 19:22:53 +02:00
|
|
|
#ifndef _STL_ALGOBASE_H
|
|
|
|
#define _STL_ALGOBASE_H 1
|
2000-10-05 13:27:02 +02:00
|
|
|
|
2001-02-20 21:20:48 +01:00
|
|
|
#include <bits/c++config.h>
|
2007-03-03 11:29:14 +01:00
|
|
|
#include <bits/functexcept.h>
|
2004-06-30 11:20:18 +02:00
|
|
|
#include <bits/cpp_type_traits.h>
|
2006-09-18 15:30:56 +02:00
|
|
|
#include <ext/type_traits.h>
|
numeric_traits.h: Do not include <limits>.
2007-04-13 Paolo Carlini <pcarlini@suse.de>
* include/ext/numeric_traits.h: Do not include <limits>.
(__numeric_traits_integer::__is_signed, __digits): Add.
(__numeric_traits_floating::__digits10, __max_exponent10): Add.
* src/istream.cc (ignore<char>(streamsize, int_type), operator>>
(basic_istream<char>&, char*), ignore<wchar_t>(streamsize,
int_type)): Use the latter.
* src/compatibility.cc (ignore<char>(streamsize),
ignore<wchar_t>(streamsize)): Likewise.
* include/ext/vstring_util.h (__vstring_utility<>::_S_compare):
Likewise.
* include/bits/stl_memory.h (__get_temporary_buffer): Likewise.
* include/bits/stl_algobase.h (lexicographical_compare(const char*,
const char*, const char*, const char*)): Likewise.
* include/bits/locale_facets.tcc (num_get<>::_M_extract_int(_InIter,
_InIter, ios_base&, ios_base::iostate&, _ValueT&),
num_put<>::_M_insert_int(_OutIter, ios_base&, _CharT, _ValueT),
num_put<>::_M_insert_float(_OutIter, ios_base&, _CharT, char,
_ValueT), collate<>::do_hash(const _CharT*, const _CharT*)): Likewise.
* include/bits/basic_string.h (basic_string<>::_S_compare): Likewise.
* include/bits/istream.tcc (operator>>(short&), operator>>(int&),
ignore(streamsize), ignore(streamsize, int_type), operator>>
(basic_istream<>&, _CharT*)): Likewise.
* include/bits/stl_bvector.h (vector<bool>::max_size): Likewise.
* include/tr1/functional_hash.h (struct hash<long double>): Likewise.
* include/std/istream: Do not include <limits>.
* include/tr1/cmath: Include <limits>.
* testsuite/23_containers/vector/bool/capacity/29134.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_arithmetic/char/12.cc:
Likewise.
* testsuite/27_io/basic_istream/extractors_arithmetic/char/13.cc:
Likewise.
* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/12.cc:
Likewise.
* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/13.cc:
Likewise.
* testsuite/27_io/ios_base/storage/2.cc: Likewise.
* include/tr1/hashtable: Do not include the whole <iterator>.
From-SVN: r123779
2007-04-13 12:54:37 +02:00
|
|
|
#include <ext/numeric_traits.h>
|
2009-11-13 16:06:28 +01:00
|
|
|
#include <bits/stl_pair.h>
|
2007-11-15 20:05:17 +01:00
|
|
|
#include <bits/stl_iterator_base_types.h>
|
2001-04-03 02:26:58 +02:00
|
|
|
#include <bits/stl_iterator_base_funcs.h>
|
2000-10-05 13:27:02 +02:00
|
|
|
#include <bits/stl_iterator.h>
|
2001-04-03 02:26:58 +02:00
|
|
|
#include <bits/concept_check.h>
|
2003-11-11 21:09:16 +01:00
|
|
|
#include <debug/debug.h>
|
2009-11-13 16:06:28 +01:00
|
|
|
#include <bits/move.h> // For std::swap and _GLIBCXX_MOVE
|
[multiple changes]
2007-10-07 Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_algobase.h (_GLIBCXX_MOVE): Add.
(swap, __iter_swap): Use it.
* testsuite/25_algorithms/rotate/moveable.cc: Remove dg-require-rvalref.
* testsuite/25_algorithms/remove/moveable.cc: Likewise.
* testsuite/25_algorithms/partition/moveable.cc: Likewise.
* testsuite/25_algorithms/swap_ranges/moveable.cc: Likewise.
* testsuite/25_algorithms/reverse/moveable.cc: Likewise.
* testsuite/25_algorithms/unique/moveable.cc: Likewise.
* testsuite/25_algorithms/remove_if/moveable.cc: Likewise.
* include/bits/stl_algobase.h (lexicographical_compare):
Clean up.
2007-10-07 Chris Jefferson <chris@bubblescope.net>
Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_algo.h (remove, remove_if, unique,
__rotate(_RandomAccessIterator, _RandomAccessIterator,
_RandomAccessIterator, random_access_iterator_tag)): Use _GLIBCXX_MOVE.
(__rotate(_ForwardIterator, _ForwardIterator, _ForwardIterator,
forward_iterator_tag), __rotate(_BidirectionalIterator,
_BidirectionalIterator, _BidirectionalIterator,
bidirectional_iterator_tag), __partition(_ForwardIterator,
_ForwardIterator, _Predicate, forward_iterator_tag)): Use iter_swap.
From-SVN: r129068
2007-10-07 13:14:11 +02:00
|
|
|
|
PR libstdc++/36104 part four
2011-01-30 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/36104 part four
* include/bits/c++config (_GLIBCXX_STD): Remove.
(_GLIBCXX_STD_D, _GLIBCXX_PR): Now _GLIBCXX_STD_C.
(_GLIBCXX_P): Now _GLIBCXX_STD_A.
(_GLIBCXX_NAMESPACE_DEBUG, _GLIBCXX_NAMESPACE_PARALLEL,
_GLIBCXX_NAMESPACE_PROFILE, _GLIBCXX_NAMESPACE_VERSION): Remove.
(_GLIBCXX_INLINE_DEBUG, _GLIBCXX_INLINE_PARALLEL,
_GLIBCXX_INLINE_PROFILE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE(X)): Remove.
(_GLIBCXX_END_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NESTED_NAMESPACE(X, Y)): Remove.
(_GLIBCXX_END_NESTED_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE_ALGO): Add.
(_GLIBCXX_END_NAMESPACE_ALGO): Add.
(_GLIBCXX_BEGIN_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_END_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_BEGIN_NAMESPACE_VERSION): Add.
(_GLIBCXX_END_NAMESPACE_VERSION): Add.
(_GLIBCXX_BEGIN_LDBL_NAMESPACE): To _GLIBCXX_BEGIN_NAMESPACE_LDBL.
(_GLIBCXX_END_LDBL_NAMESPACE): To _GLIBCXX_END_NAMESPACE_LDBL.
(_GLIBCXX_VISIBILITY_ATTR): Revert to _GLIBCXX_VISIBILITY.
* include/*: Use new macros for namespace scope.
* config/*: Same.
* src/*: Same.
* src/Makefile.am (sources): Remove debug_list.cc, add
compatibility-debug_list-2.cc.
(parallel_sources): Remove parallel_list.cc, add
compatibility-parallel_list-2.cc.
(compatibility-parallel_list-2.[o,lo]): New rule.
* src/Makefile.in: Regenerate.
* src/debug_list.cc: Remove.
* src/parallel_list.cc: Remove.
* src/compatibility-list-2.cc: New.
* src/compatibility-debug_list-2.cc: New.
* src/compatibility-parallel_list-2.cc: New.
* doc/doxygen/user.cfg.in: Adjust macros.
* testsuite/20_util/auto_ptr/assign_neg.cc: Adjust line numbers, macros.
* testsuite/20_util/declval/requirements/1_neg.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg1.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg2.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg3.cc: Same.
* testsuite/20_util/forward/c_neg.cc: Same.
* testsuite/20_util/forward/f_neg.cc: Same.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Same.
* testsuite/20_util/ratio/operations/ops_overflow_neg.cc: Same.
* testsuite/20_util/shared_ptr/cons/43820_neg.cc: Same.
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/forward_list/capacity/1.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
assign_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
insert_neg.cc: Same.
* testsuite/23_containers/list/capacity/29134.cc: Same.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/vector/bool/capacity/29134.cc: Same.
* testsuite/23_containers/vector/bool/modifiers/insert/31370.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: Same.
* testsuite/25_algorithms/sort/35588.cc: Same.
* testsuite/27_io/ios_base/cons/assign_neg.cc: Same.
* testsuite/27_io/ios_base/cons/copy_neg.cc: Same.
* testsuite/ext/profile/mutex_extensions_neg.cc: Same.
* testsuite/ext/profile/profiler_algos.cc: Same.
* testsuite/ext/type_traits/add_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/add_unsigned_integer_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_integer_neg.cc: Same.
* testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc: Same.
From-SVN: r169421
2011-01-30 23:39:36 +01:00
|
|
|
namespace std _GLIBCXX_VISIBILITY(default)
|
|
|
|
{
|
|
|
|
_GLIBCXX_BEGIN_NAMESPACE_VERSION
|
2004-10-05 12:28:17 +02:00
|
|
|
|
|
|
|
// See http://gcc.gnu.org/ml/libstdc++/2004-08/msg00167.html: in a
|
|
|
|
// nutshell, we are partially implementing the resolution of DR 187,
|
|
|
|
// when it's safe, i.e., the value_types are equal.
|
|
|
|
template<bool _BoolType>
|
|
|
|
struct __iter_swap
|
|
|
|
{
|
|
|
|
template<typename _ForwardIterator1, typename _ForwardIterator2>
|
|
|
|
static void
|
|
|
|
iter_swap(_ForwardIterator1 __a, _ForwardIterator2 __b)
|
|
|
|
{
|
|
|
|
typedef typename iterator_traits<_ForwardIterator1>::value_type
|
|
|
|
_ValueType1;
|
[multiple changes]
2007-10-07 Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_algobase.h (_GLIBCXX_MOVE): Add.
(swap, __iter_swap): Use it.
* testsuite/25_algorithms/rotate/moveable.cc: Remove dg-require-rvalref.
* testsuite/25_algorithms/remove/moveable.cc: Likewise.
* testsuite/25_algorithms/partition/moveable.cc: Likewise.
* testsuite/25_algorithms/swap_ranges/moveable.cc: Likewise.
* testsuite/25_algorithms/reverse/moveable.cc: Likewise.
* testsuite/25_algorithms/unique/moveable.cc: Likewise.
* testsuite/25_algorithms/remove_if/moveable.cc: Likewise.
* include/bits/stl_algobase.h (lexicographical_compare):
Clean up.
2007-10-07 Chris Jefferson <chris@bubblescope.net>
Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_algo.h (remove, remove_if, unique,
__rotate(_RandomAccessIterator, _RandomAccessIterator,
_RandomAccessIterator, random_access_iterator_tag)): Use _GLIBCXX_MOVE.
(__rotate(_ForwardIterator, _ForwardIterator, _ForwardIterator,
forward_iterator_tag), __rotate(_BidirectionalIterator,
_BidirectionalIterator, _BidirectionalIterator,
bidirectional_iterator_tag), __partition(_ForwardIterator,
_ForwardIterator, _Predicate, forward_iterator_tag)): Use iter_swap.
From-SVN: r129068
2007-10-07 13:14:11 +02:00
|
|
|
_ValueType1 __tmp = _GLIBCXX_MOVE(*__a);
|
|
|
|
*__a = _GLIBCXX_MOVE(*__b);
|
|
|
|
*__b = _GLIBCXX_MOVE(__tmp);
|
2004-10-05 12:28:17 +02:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
template<>
|
|
|
|
struct __iter_swap<true>
|
|
|
|
{
|
|
|
|
template<typename _ForwardIterator1, typename _ForwardIterator2>
|
|
|
|
static void
|
|
|
|
iter_swap(_ForwardIterator1 __a, _ForwardIterator2 __b)
|
|
|
|
{
|
|
|
|
swap(*__a, *__b);
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
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
|
|
|
/**
|
|
|
|
* @brief Swaps the contents of two iterators.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @ingroup mutating_algorithms
|
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
|
|
|
* @param a An iterator.
|
|
|
|
* @param b Another iterator.
|
|
|
|
* @return Nothing.
|
|
|
|
*
|
|
|
|
* This function swaps the values pointed to by two iterators, not the
|
|
|
|
* iterators themselves.
|
|
|
|
*/
|
BUGS: Update from 2.90.8 snapshot.
2003-06-10 Phil Edwards <pme@gcc.gnu.org>
* docs/html/17_intro/BUGS: Update from 2.90.8 snapshot.
* docs/html/17_intro/CHECKLIST: Bring up to date with respect to
correctness of container::iterator typedefs. Fix whitespace.
* docs/html/20_util/howto.html, docs/html/ext/howto.html: Add links
to allocator docs.
* docs/html/documentation.html: Regenerate.
* include/bits/basic_string.h, include/bits/basic_string.tcc,
include/bits/deque.tcc, include/bits/list.tcc, include/bits/stl_algo.h,
include/bits/stl_algobase.h, include/bits/stl_bvector.h,
include/bits/stl_deque.h, include/bits/stl_iterator_base_funcs.h,
include/bits/stl_list.h, include/bits/stl_uninitialized.h,
include/bits/stl_vector.h, include/bits/vector.tcc,
include/ext/algorithm, include/ext/slist, include/std/std_bitset.h:
Change _Iter names to _Iterator, and __pos to __position.
* include/bits/stl_relops.h, include/bits/stl_numeric.h,
include/bits/stl_multiset.h, include/bits/stl_set.h:
Remove emacs markers.
* include/bits/stl_threads.h (_STL_auto_lock): Add __unused__.
From-SVN: r67736
2003-06-10 23:52:25 +02:00
|
|
|
template<typename _ForwardIterator1, typename _ForwardIterator2>
|
2001-07-18 19:09:02 +02:00
|
|
|
inline void
|
BUGS: Update from 2.90.8 snapshot.
2003-06-10 Phil Edwards <pme@gcc.gnu.org>
* docs/html/17_intro/BUGS: Update from 2.90.8 snapshot.
* docs/html/17_intro/CHECKLIST: Bring up to date with respect to
correctness of container::iterator typedefs. Fix whitespace.
* docs/html/20_util/howto.html, docs/html/ext/howto.html: Add links
to allocator docs.
* docs/html/documentation.html: Regenerate.
* include/bits/basic_string.h, include/bits/basic_string.tcc,
include/bits/deque.tcc, include/bits/list.tcc, include/bits/stl_algo.h,
include/bits/stl_algobase.h, include/bits/stl_bvector.h,
include/bits/stl_deque.h, include/bits/stl_iterator_base_funcs.h,
include/bits/stl_list.h, include/bits/stl_uninitialized.h,
include/bits/stl_vector.h, include/bits/vector.tcc,
include/ext/algorithm, include/ext/slist, include/std/std_bitset.h:
Change _Iter names to _Iterator, and __pos to __position.
* include/bits/stl_relops.h, include/bits/stl_numeric.h,
include/bits/stl_multiset.h, include/bits/stl_set.h:
Remove emacs markers.
* include/bits/stl_threads.h (_STL_auto_lock): Add __unused__.
From-SVN: r67736
2003-06-10 23:52:25 +02:00
|
|
|
iter_swap(_ForwardIterator1 __a, _ForwardIterator2 __b)
|
2001-07-18 19:09:02 +02:00
|
|
|
{
|
2004-01-31 22:37:11 +01:00
|
|
|
typedef typename iterator_traits<_ForwardIterator1>::value_type
|
|
|
|
_ValueType1;
|
|
|
|
typedef typename iterator_traits<_ForwardIterator2>::value_type
|
|
|
|
_ValueType2;
|
2001-07-18 19:09:02 +02:00
|
|
|
|
|
|
|
// concept requirements
|
2004-01-31 22:37:11 +01:00
|
|
|
__glibcxx_function_requires(_Mutable_ForwardIteratorConcept<
|
|
|
|
_ForwardIterator1>)
|
|
|
|
__glibcxx_function_requires(_Mutable_ForwardIteratorConcept<
|
|
|
|
_ForwardIterator2>)
|
|
|
|
__glibcxx_function_requires(_ConvertibleConcept<_ValueType1,
|
|
|
|
_ValueType2>)
|
|
|
|
__glibcxx_function_requires(_ConvertibleConcept<_ValueType2,
|
|
|
|
_ValueType1>)
|
2005-03-21 23:16:15 +01:00
|
|
|
|
|
|
|
typedef typename iterator_traits<_ForwardIterator1>::reference
|
|
|
|
_ReferenceType1;
|
|
|
|
typedef typename iterator_traits<_ForwardIterator2>::reference
|
|
|
|
_ReferenceType2;
|
PR libstdc++/30449 (equal)
2007-04-30 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/30449 (equal)
* include/bits/stl_algobase.h (struct __niter_base): Add.
(copy(_II, _II, _OI), copy_backward(_BI1, _BI1, _BI2),
fill(_ForwardIterator, _ForwardIterator, const _Tp&),
fill_n(_OI, _Size, const _Tp&), equal(_II1, _II1, _II2)):
Use it.
(struct __copy_normal, __copy_backward_normal,
struct __fill_normal, struct __fill_n_normal): Remove.
(struct __equal, struct __equal_aux): Add.
* include/bits/stl_iterator.h: Add _Iterator_type typedef.
* include/bits/stl_algobase.h (__fill_aux(wchar_t*,
wchar_t*, wchar_t), __fill_n_aux(wchar_t*, _Size, wchar_t)):
Remove.
* testsuite/23_containers/requirements/sequences/dr438/vector/
constructor_1_neg.cc: Adjust dg-error line number.
* testsuite/23_containers/requirements/sequences/dr438/vector/
constructor_2_neg.cc: Likewise.
From-SVN: r124295
2007-04-30 15:10:54 +02:00
|
|
|
std::__iter_swap<__are_same<_ValueType1, _ValueType2>::__value
|
|
|
|
&& __are_same<_ValueType1&, _ReferenceType1>::__value
|
|
|
|
&& __are_same<_ValueType2&, _ReferenceType2>::__value>::
|
2004-10-05 12:28:17 +02:00
|
|
|
iter_swap(__a, __b);
|
2001-07-18 19:09:02 +02:00
|
|
|
}
|
|
|
|
|
2007-03-12 14:59:50 +01:00
|
|
|
/**
|
|
|
|
* @brief Swap the elements of two sequences.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @ingroup mutating_algorithms
|
2007-03-12 14:59:50 +01:00
|
|
|
* @param first1 A forward iterator.
|
|
|
|
* @param last1 A forward iterator.
|
|
|
|
* @param first2 A forward iterator.
|
|
|
|
* @return An iterator equal to @p first2+(last1-first1).
|
|
|
|
*
|
|
|
|
* Swaps each element in the range @p [first1,last1) with the
|
|
|
|
* corresponding element in the range @p [first2,(last1-first1)).
|
|
|
|
* The ranges must not overlap.
|
|
|
|
*/
|
|
|
|
template<typename _ForwardIterator1, typename _ForwardIterator2>
|
|
|
|
_ForwardIterator2
|
|
|
|
swap_ranges(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
|
|
|
|
_ForwardIterator2 __first2)
|
|
|
|
{
|
|
|
|
// concept requirements
|
|
|
|
__glibcxx_function_requires(_Mutable_ForwardIteratorConcept<
|
|
|
|
_ForwardIterator1>)
|
|
|
|
__glibcxx_function_requires(_Mutable_ForwardIteratorConcept<
|
|
|
|
_ForwardIterator2>)
|
|
|
|
__glibcxx_requires_valid_range(__first1, __last1);
|
|
|
|
|
|
|
|
for (; __first1 != __last1; ++__first1, ++__first2)
|
|
|
|
std::iter_swap(__first1, __first2);
|
|
|
|
return __first2;
|
|
|
|
}
|
|
|
|
|
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
|
|
|
/**
|
|
|
|
* @brief This does what you think it does.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @ingroup sorting_algorithms
|
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
|
|
|
* @param a A thing of arbitrary type.
|
|
|
|
* @param b Another thing of arbitrary type.
|
|
|
|
* @return The lesser of the parameters.
|
|
|
|
*
|
|
|
|
* This is the simple classic generic implementation. It will work on
|
|
|
|
* temporary expressions, since they are only evaluated once, unlike a
|
|
|
|
* preprocessor macro.
|
|
|
|
*/
|
2001-07-18 19:09:02 +02:00
|
|
|
template<typename _Tp>
|
|
|
|
inline const _Tp&
|
|
|
|
min(const _Tp& __a, const _Tp& __b)
|
|
|
|
{
|
|
|
|
// concept requirements
|
2003-07-05 06:05:45 +02:00
|
|
|
__glibcxx_function_requires(_LessThanComparableConcept<_Tp>)
|
2001-07-18 19:09:02 +02:00
|
|
|
//return __b < __a ? __b : __a;
|
2004-01-31 22:37:11 +01:00
|
|
|
if (__b < __a)
|
|
|
|
return __b;
|
|
|
|
return __a;
|
2001-07-18 19:09:02 +02:00
|
|
|
}
|
|
|
|
|
2001-11-20 01:51:37 +01:00
|
|
|
/**
|
|
|
|
* @brief This does what you think it does.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @ingroup sorting_algorithms
|
2001-11-20 01:51:37 +01:00
|
|
|
* @param a A thing of arbitrary type.
|
|
|
|
* @param b Another thing of arbitrary type.
|
|
|
|
* @return The greater of the parameters.
|
|
|
|
*
|
|
|
|
* This is the simple classic generic implementation. It will work on
|
|
|
|
* temporary expressions, since they are only evaluated once, unlike a
|
|
|
|
* preprocessor macro.
|
|
|
|
*/
|
2001-07-18 19:09:02 +02:00
|
|
|
template<typename _Tp>
|
|
|
|
inline const _Tp&
|
2004-02-08 05:46:42 +01:00
|
|
|
max(const _Tp& __a, const _Tp& __b)
|
2001-07-18 19:09:02 +02:00
|
|
|
{
|
|
|
|
// concept requirements
|
2003-07-05 06:05:45 +02:00
|
|
|
__glibcxx_function_requires(_LessThanComparableConcept<_Tp>)
|
2001-07-18 19:09:02 +02:00
|
|
|
//return __a < __b ? __b : __a;
|
2004-01-31 22:37:11 +01:00
|
|
|
if (__a < __b)
|
|
|
|
return __b;
|
|
|
|
return __a;
|
2001-07-18 19:09:02 +02:00
|
|
|
}
|
|
|
|
|
2001-11-20 01:51:37 +01:00
|
|
|
/**
|
|
|
|
* @brief This does what you think it does.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @ingroup sorting_algorithms
|
2001-11-20 01:51:37 +01:00
|
|
|
* @param a A thing of arbitrary type.
|
|
|
|
* @param b Another thing of arbitrary type.
|
2009-02-19 09:15:15 +01:00
|
|
|
* @param comp A @link comparison_functors comparison functor@endlink.
|
2001-11-20 01:51:37 +01:00
|
|
|
* @return The lesser of the parameters.
|
|
|
|
*
|
|
|
|
* This will work on temporary expressions, since they are only evaluated
|
|
|
|
* once, unlike a preprocessor macro.
|
|
|
|
*/
|
2001-07-18 19:09:02 +02:00
|
|
|
template<typename _Tp, typename _Compare>
|
|
|
|
inline const _Tp&
|
|
|
|
min(const _Tp& __a, const _Tp& __b, _Compare __comp)
|
|
|
|
{
|
|
|
|
//return __comp(__b, __a) ? __b : __a;
|
2004-01-31 22:37:11 +01:00
|
|
|
if (__comp(__b, __a))
|
|
|
|
return __b;
|
|
|
|
return __a;
|
2001-07-18 19:09:02 +02:00
|
|
|
}
|
|
|
|
|
2001-11-20 01:51:37 +01:00
|
|
|
/**
|
|
|
|
* @brief This does what you think it does.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @ingroup sorting_algorithms
|
2001-11-20 01:51:37 +01:00
|
|
|
* @param a A thing of arbitrary type.
|
|
|
|
* @param b Another thing of arbitrary type.
|
2009-02-19 09:15:15 +01:00
|
|
|
* @param comp A @link comparison_functors comparison functor@endlink.
|
2001-11-20 01:51:37 +01:00
|
|
|
* @return The greater of the parameters.
|
|
|
|
*
|
|
|
|
* This will work on temporary expressions, since they are only evaluated
|
|
|
|
* once, unlike a preprocessor macro.
|
|
|
|
*/
|
2001-07-18 19:09:02 +02:00
|
|
|
template<typename _Tp, typename _Compare>
|
|
|
|
inline const _Tp&
|
|
|
|
max(const _Tp& __a, const _Tp& __b, _Compare __comp)
|
|
|
|
{
|
|
|
|
//return __comp(__a, __b) ? __b : __a;
|
2004-01-31 22:37:11 +01:00
|
|
|
if (__comp(__a, __b))
|
|
|
|
return __b;
|
|
|
|
return __a;
|
2001-07-18 19:09:02 +02:00
|
|
|
}
|
|
|
|
|
2010-01-28 23:29:52 +01:00
|
|
|
// If _Iterator is a __normal_iterator return its base (a plain pointer,
|
|
|
|
// normally) otherwise return it untouched. See copy, fill, ...
|
|
|
|
template<typename _Iterator>
|
2010-02-05 11:55:54 +01:00
|
|
|
struct _Niter_base
|
|
|
|
: _Iter_base<_Iterator, __is_normal_iterator<_Iterator>::__value>
|
2010-01-28 23:29:52 +01:00
|
|
|
{ };
|
2007-10-27 14:07:04 +02:00
|
|
|
|
2010-02-05 11:55:54 +01:00
|
|
|
template<typename _Iterator>
|
|
|
|
inline typename _Niter_base<_Iterator>::iterator_type
|
|
|
|
__niter_base(_Iterator __it)
|
|
|
|
{ return std::_Niter_base<_Iterator>::_S_base(__it); }
|
|
|
|
|
2010-01-28 23:29:52 +01:00
|
|
|
// Likewise, for move_iterator.
|
2007-10-27 14:07:04 +02:00
|
|
|
template<typename _Iterator>
|
2010-02-05 11:55:54 +01:00
|
|
|
struct _Miter_base
|
|
|
|
: _Iter_base<_Iterator, __is_move_iterator<_Iterator>::__value>
|
2010-01-28 23:29:52 +01:00
|
|
|
{ };
|
PR libstdc++/30449 (equal)
2007-04-30 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/30449 (equal)
* include/bits/stl_algobase.h (struct __niter_base): Add.
(copy(_II, _II, _OI), copy_backward(_BI1, _BI1, _BI2),
fill(_ForwardIterator, _ForwardIterator, const _Tp&),
fill_n(_OI, _Size, const _Tp&), equal(_II1, _II1, _II2)):
Use it.
(struct __copy_normal, __copy_backward_normal,
struct __fill_normal, struct __fill_n_normal): Remove.
(struct __equal, struct __equal_aux): Add.
* include/bits/stl_iterator.h: Add _Iterator_type typedef.
* include/bits/stl_algobase.h (__fill_aux(wchar_t*,
wchar_t*, wchar_t), __fill_n_aux(wchar_t*, _Size, wchar_t)):
Remove.
* testsuite/23_containers/requirements/sequences/dr438/vector/
constructor_1_neg.cc: Adjust dg-error line number.
* testsuite/23_containers/requirements/sequences/dr438/vector/
constructor_2_neg.cc: Likewise.
From-SVN: r124295
2007-04-30 15:10:54 +02:00
|
|
|
|
2010-02-05 11:55:54 +01:00
|
|
|
template<typename _Iterator>
|
|
|
|
inline typename _Miter_base<_Iterator>::iterator_type
|
|
|
|
__miter_base(_Iterator __it)
|
|
|
|
{ return std::_Miter_base<_Iterator>::_S_base(__it); }
|
|
|
|
|
2004-07-02 16:49:09 +02:00
|
|
|
// All of these auxiliary structs serve two purposes. (1) Replace
|
2001-07-18 19:09:02 +02:00
|
|
|
// calls to copy with memmove whenever possible. (Memmove, not memcpy,
|
|
|
|
// because the input and output ranges are permitted to overlap.)
|
|
|
|
// (2) If we're using random access iterators, then write the loop as
|
|
|
|
// a for loop with an explicit count.
|
|
|
|
|
re PR libstdc++/34595 (std::copy copies the output iterator before assigning)
2007-12-26 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/34595
* include/bits/stl_algobase.h (struct __cm_assign): Remove.
(struct __copy_move<true, false, _Category>,
struct __copy_move<true, false, random_access_iterator_tag>,
struct __copy_move_backward<true, false, _Category>,
struct __copy_move_backward<true, false, random_access_iterator_tag>):
Add.
(struct __copy_move, struct __copy_move_backward,
struct __copy_move<false, false, random_access_iterator_tag>,
struct __copy_move_backward<false, false, random_access_iterator_tag>):
Adjust.
* testsuite/25_algorithms/copy/34595.C: New.
From-SVN: r131188
2007-12-26 22:58:49 +01:00
|
|
|
template<bool, bool, typename>
|
stl_algobase.h (struct __cm_assign, [...]): Add.
2007-10-19 Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_algobase.h (struct __cm_assign,
struct __copy_move, struct __copy_move_backward, move,
move_backward): Add.
(struct __copy, struct __copy_backward): Remove.
(__copy_aux, __copy_backward_aux): Rename to...
(__copy_move_a, __copy_move_backward_a): ... this, and
adjust calls.
(copy, copy_backward): Adjust calls.
* include/bits/streambuf_iterator.h (__copy_aux): Rename
to ...
(__copy_move_a): ... this; add bool template parameter.
* include/std/streambuf: Adjust friend declarations.
* testsuite/util/testsuite_iterators.h
(WritableObject<>::operator=(U&&)): Add.
* testsuite/25_algorithms/move/1.cc: New.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/pod.cc: Likewise.
* testsuite/25_algorithms/move_backward/1.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/pod.cc: Likewise.
From-SVN: r129492
2007-10-19 19:04:59 +02:00
|
|
|
struct __copy_move
|
2001-07-18 19:09:02 +02:00
|
|
|
{
|
2004-07-01 19:53:21 +02:00
|
|
|
template<typename _II, typename _OI>
|
|
|
|
static _OI
|
stl_algobase.h (struct __cm_assign, [...]): Add.
2007-10-19 Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_algobase.h (struct __cm_assign,
struct __copy_move, struct __copy_move_backward, move,
move_backward): Add.
(struct __copy, struct __copy_backward): Remove.
(__copy_aux, __copy_backward_aux): Rename to...
(__copy_move_a, __copy_move_backward_a): ... this, and
adjust calls.
(copy, copy_backward): Adjust calls.
* include/bits/streambuf_iterator.h (__copy_aux): Rename
to ...
(__copy_move_a): ... this; add bool template parameter.
* include/std/streambuf: Adjust friend declarations.
* testsuite/util/testsuite_iterators.h
(WritableObject<>::operator=(U&&)): Add.
* testsuite/25_algorithms/move/1.cc: New.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/pod.cc: Likewise.
* testsuite/25_algorithms/move_backward/1.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/pod.cc: Likewise.
From-SVN: r129492
2007-10-19 19:04:59 +02:00
|
|
|
__copy_m(_II __first, _II __last, _OI __result)
|
2004-07-01 19:53:21 +02:00
|
|
|
{
|
|
|
|
for (; __first != __last; ++__result, ++__first)
|
re PR libstdc++/34595 (std::copy copies the output iterator before assigning)
2007-12-26 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/34595
* include/bits/stl_algobase.h (struct __cm_assign): Remove.
(struct __copy_move<true, false, _Category>,
struct __copy_move<true, false, random_access_iterator_tag>,
struct __copy_move_backward<true, false, _Category>,
struct __copy_move_backward<true, false, random_access_iterator_tag>):
Add.
(struct __copy_move, struct __copy_move_backward,
struct __copy_move<false, false, random_access_iterator_tag>,
struct __copy_move_backward<false, false, random_access_iterator_tag>):
Adjust.
* testsuite/25_algorithms/copy/34595.C: New.
From-SVN: r131188
2007-12-26 22:58:49 +01:00
|
|
|
*__result = *__first;
|
|
|
|
return __result;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
|
|
template<typename _Category>
|
|
|
|
struct __copy_move<true, false, _Category>
|
|
|
|
{
|
|
|
|
template<typename _II, typename _OI>
|
|
|
|
static _OI
|
|
|
|
__copy_m(_II __first, _II __last, _OI __result)
|
|
|
|
{
|
|
|
|
for (; __first != __last; ++__result, ++__first)
|
|
|
|
*__result = std::move(*__first);
|
|
|
|
return __result;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
#endif
|
|
|
|
|
|
|
|
template<>
|
|
|
|
struct __copy_move<false, false, random_access_iterator_tag>
|
|
|
|
{
|
|
|
|
template<typename _II, typename _OI>
|
|
|
|
static _OI
|
|
|
|
__copy_m(_II __first, _II __last, _OI __result)
|
|
|
|
{
|
|
|
|
typedef typename iterator_traits<_II>::difference_type _Distance;
|
|
|
|
for(_Distance __n = __last - __first; __n > 0; --__n)
|
|
|
|
{
|
|
|
|
*__result = *__first;
|
|
|
|
++__first;
|
|
|
|
++__result;
|
|
|
|
}
|
2004-07-01 19:53:21 +02:00
|
|
|
return __result;
|
|
|
|
}
|
|
|
|
};
|
2001-07-18 19:09:02 +02:00
|
|
|
|
re PR libstdc++/34595 (std::copy copies the output iterator before assigning)
2007-12-26 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/34595
* include/bits/stl_algobase.h (struct __cm_assign): Remove.
(struct __copy_move<true, false, _Category>,
struct __copy_move<true, false, random_access_iterator_tag>,
struct __copy_move_backward<true, false, _Category>,
struct __copy_move_backward<true, false, random_access_iterator_tag>):
Add.
(struct __copy_move, struct __copy_move_backward,
struct __copy_move<false, false, random_access_iterator_tag>,
struct __copy_move_backward<false, false, random_access_iterator_tag>):
Adjust.
* testsuite/25_algorithms/copy/34595.C: New.
From-SVN: r131188
2007-12-26 22:58:49 +01:00
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
|
|
template<>
|
|
|
|
struct __copy_move<true, false, random_access_iterator_tag>
|
2001-07-18 19:09:02 +02:00
|
|
|
{
|
2004-07-01 19:53:21 +02:00
|
|
|
template<typename _II, typename _OI>
|
|
|
|
static _OI
|
stl_algobase.h (struct __cm_assign, [...]): Add.
2007-10-19 Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_algobase.h (struct __cm_assign,
struct __copy_move, struct __copy_move_backward, move,
move_backward): Add.
(struct __copy, struct __copy_backward): Remove.
(__copy_aux, __copy_backward_aux): Rename to...
(__copy_move_a, __copy_move_backward_a): ... this, and
adjust calls.
(copy, copy_backward): Adjust calls.
* include/bits/streambuf_iterator.h (__copy_aux): Rename
to ...
(__copy_move_a): ... this; add bool template parameter.
* include/std/streambuf: Adjust friend declarations.
* testsuite/util/testsuite_iterators.h
(WritableObject<>::operator=(U&&)): Add.
* testsuite/25_algorithms/move/1.cc: New.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/pod.cc: Likewise.
* testsuite/25_algorithms/move_backward/1.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/pod.cc: Likewise.
From-SVN: r129492
2007-10-19 19:04:59 +02:00
|
|
|
__copy_m(_II __first, _II __last, _OI __result)
|
2004-07-01 19:53:21 +02:00
|
|
|
{
|
|
|
|
typedef typename iterator_traits<_II>::difference_type _Distance;
|
|
|
|
for(_Distance __n = __last - __first; __n > 0; --__n)
|
|
|
|
{
|
re PR libstdc++/34595 (std::copy copies the output iterator before assigning)
2007-12-26 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/34595
* include/bits/stl_algobase.h (struct __cm_assign): Remove.
(struct __copy_move<true, false, _Category>,
struct __copy_move<true, false, random_access_iterator_tag>,
struct __copy_move_backward<true, false, _Category>,
struct __copy_move_backward<true, false, random_access_iterator_tag>):
Add.
(struct __copy_move, struct __copy_move_backward,
struct __copy_move<false, false, random_access_iterator_tag>,
struct __copy_move_backward<false, false, random_access_iterator_tag>):
Adjust.
* testsuite/25_algorithms/copy/34595.C: New.
From-SVN: r131188
2007-12-26 22:58:49 +01:00
|
|
|
*__result = std::move(*__first);
|
2004-07-01 19:53:21 +02:00
|
|
|
++__first;
|
|
|
|
++__result;
|
|
|
|
}
|
|
|
|
return __result;
|
2003-06-06 02:19:17 +02:00
|
|
|
}
|
2004-07-01 19:53:21 +02:00
|
|
|
};
|
re PR libstdc++/34595 (std::copy copies the output iterator before assigning)
2007-12-26 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/34595
* include/bits/stl_algobase.h (struct __cm_assign): Remove.
(struct __copy_move<true, false, _Category>,
struct __copy_move<true, false, random_access_iterator_tag>,
struct __copy_move_backward<true, false, _Category>,
struct __copy_move_backward<true, false, random_access_iterator_tag>):
Add.
(struct __copy_move, struct __copy_move_backward,
struct __copy_move<false, false, random_access_iterator_tag>,
struct __copy_move_backward<false, false, random_access_iterator_tag>):
Adjust.
* testsuite/25_algorithms/copy/34595.C: New.
From-SVN: r131188
2007-12-26 22:58:49 +01:00
|
|
|
#endif
|
2001-07-18 19:09:02 +02:00
|
|
|
|
2007-10-27 14:07:04 +02:00
|
|
|
template<bool _IsMove>
|
|
|
|
struct __copy_move<_IsMove, true, random_access_iterator_tag>
|
2001-07-18 19:09:02 +02:00
|
|
|
{
|
2004-07-01 19:53:21 +02:00
|
|
|
template<typename _Tp>
|
|
|
|
static _Tp*
|
stl_algobase.h (struct __cm_assign, [...]): Add.
2007-10-19 Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_algobase.h (struct __cm_assign,
struct __copy_move, struct __copy_move_backward, move,
move_backward): Add.
(struct __copy, struct __copy_backward): Remove.
(__copy_aux, __copy_backward_aux): Rename to...
(__copy_move_a, __copy_move_backward_a): ... this, and
adjust calls.
(copy, copy_backward): Adjust calls.
* include/bits/streambuf_iterator.h (__copy_aux): Rename
to ...
(__copy_move_a): ... this; add bool template parameter.
* include/std/streambuf: Adjust friend declarations.
* testsuite/util/testsuite_iterators.h
(WritableObject<>::operator=(U&&)): Add.
* testsuite/25_algorithms/move/1.cc: New.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/pod.cc: Likewise.
* testsuite/25_algorithms/move_backward/1.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/pod.cc: Likewise.
From-SVN: r129492
2007-10-19 19:04:59 +02:00
|
|
|
__copy_m(const _Tp* __first, const _Tp* __last, _Tp* __result)
|
|
|
|
{
|
2009-09-06 17:41:38 +02:00
|
|
|
const ptrdiff_t _Num = __last - __first;
|
|
|
|
if (_Num)
|
|
|
|
__builtin_memmove(__result, __first, sizeof(_Tp) * _Num);
|
|
|
|
return __result + _Num;
|
2004-07-01 19:53:21 +02:00
|
|
|
}
|
|
|
|
};
|
2001-07-18 19:09:02 +02:00
|
|
|
|
2007-10-27 14:07:04 +02:00
|
|
|
template<bool _IsMove, typename _II, typename _OI>
|
2004-07-01 19:53:21 +02:00
|
|
|
inline _OI
|
stl_algobase.h (struct __cm_assign, [...]): Add.
2007-10-19 Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_algobase.h (struct __cm_assign,
struct __copy_move, struct __copy_move_backward, move,
move_backward): Add.
(struct __copy, struct __copy_backward): Remove.
(__copy_aux, __copy_backward_aux): Rename to...
(__copy_move_a, __copy_move_backward_a): ... this, and
adjust calls.
(copy, copy_backward): Adjust calls.
* include/bits/streambuf_iterator.h (__copy_aux): Rename
to ...
(__copy_move_a): ... this; add bool template parameter.
* include/std/streambuf: Adjust friend declarations.
* testsuite/util/testsuite_iterators.h
(WritableObject<>::operator=(U&&)): Add.
* testsuite/25_algorithms/move/1.cc: New.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/pod.cc: Likewise.
* testsuite/25_algorithms/move_backward/1.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/pod.cc: Likewise.
From-SVN: r129492
2007-10-19 19:04:59 +02:00
|
|
|
__copy_move_a(_II __first, _II __last, _OI __result)
|
2004-07-01 19:53:21 +02:00
|
|
|
{
|
|
|
|
typedef typename iterator_traits<_II>::value_type _ValueTypeI;
|
|
|
|
typedef typename iterator_traits<_OI>::value_type _ValueTypeO;
|
|
|
|
typedef typename iterator_traits<_II>::iterator_category _Category;
|
2010-06-17 10:34:17 +02:00
|
|
|
const bool __simple = (__is_trivial(_ValueTypeI)
|
2005-02-01 14:30:34 +01:00
|
|
|
&& __is_pointer<_II>::__value
|
|
|
|
&& __is_pointer<_OI>::__value
|
|
|
|
&& __are_same<_ValueTypeI, _ValueTypeO>::__value);
|
2004-07-01 19:53:21 +02:00
|
|
|
|
2007-10-27 14:07:04 +02:00
|
|
|
return std::__copy_move<_IsMove, __simple,
|
stl_algobase.h (struct __cm_assign, [...]): Add.
2007-10-19 Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_algobase.h (struct __cm_assign,
struct __copy_move, struct __copy_move_backward, move,
move_backward): Add.
(struct __copy, struct __copy_backward): Remove.
(__copy_aux, __copy_backward_aux): Rename to...
(__copy_move_a, __copy_move_backward_a): ... this, and
adjust calls.
(copy, copy_backward): Adjust calls.
* include/bits/streambuf_iterator.h (__copy_aux): Rename
to ...
(__copy_move_a): ... this; add bool template parameter.
* include/std/streambuf: Adjust friend declarations.
* testsuite/util/testsuite_iterators.h
(WritableObject<>::operator=(U&&)): Add.
* testsuite/25_algorithms/move/1.cc: New.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/pod.cc: Likewise.
* testsuite/25_algorithms/move_backward/1.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/pod.cc: Likewise.
From-SVN: r129492
2007-10-19 19:04:59 +02:00
|
|
|
_Category>::__copy_m(__first, __last, __result);
|
2004-07-01 19:53:21 +02:00
|
|
|
}
|
2001-07-18 19:09:02 +02:00
|
|
|
|
re PR libstdc++/25482 (Specialize (overload) std::copy/find for streambuf iterators)
2006-03-21 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/25482
* include/bits/stl_algobase.h (__copy_aux(_CharT*, _CharT*,
ostreambuf_iterator<_CharT>), __copy_aux(const _CharT*, const _CharT*,
ostreambuf_iterator<_CharT>), __copy_aux(istreambuf_iterator<_CharT>,
istreambuf_iterator<_CharT>, _CharT*), copy(istreambuf_iterator<_CharT>,
istreambuf_iterator<_CharT>, ostreambuf_iterator<_CharT>)): Declare.
* include/bits/stl_algo.h (find(istreambuf_iterator<_CharT>,
istreambuf_iterator<_CharT>, _CharT)): Likewise.
* include/bits/streambuf_iterator.h (copy(istreambuf_iterator<_CharT>,
istreambuf_iterator<_CharT>, ostreambuf_iterator<_CharT>),
__copy_aux(_CharT*, _CharT*, ostreambuf_iterator<_CharT>),
__copy_aux(const _CharT*, const _CharT*, ostreambuf_iterator<_CharT>),
__copy_aux(istreambuf_iterator<_CharT>, istreambuf_iterator<_CharT>,
_CharT*), find(istreambuf_iterator<_CharT>, istreambuf_iterator<_CharT>,
_CharT)): Define.
(class istreambuf_iterator<>, class ostreambuf_iterator<>): Declare
friends.
* include/std/std_streambuf.h (class basic_streambuf<>): Likewise.
* include/bits/cpp_type_traits.h (struct __is_char<>): Add.
* testsuite/25_algorithms/copy/streambuf_iterators/char/1.cc: New.
* testsuite/25_algorithms/copy/streambuf_iterators/char/2.cc: New.
* testsuite/25_algorithms/copy/streambuf_iterators/char/3.cc: New.
* testsuite/25_algorithms/copy/streambuf_iterators/char/4.cc: New.
* testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/1.cc: New.
* testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/2.cc: New.
* testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/3.cc: New.
* testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/4.cc: New.
* testsuite/25_algorithms/find/istreambuf_iterators/char/1.cc: New.
* testsuite/25_algorithms/find/istreambuf_iterators/char/2.cc: New.
* testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/1.cc: New.
* testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/2.cc: New.
* testsuite/performance/25_algorithms/copy_streambuf_iterators.cc: New.
* testsuite/performance/25_algorithms/find_istreambuf_iterators.cc: New.
From-SVN: r112247
2006-03-21 13:25:11 +01:00
|
|
|
// Helpers for streambuf iterators (either istream or ostream).
|
2007-03-03 11:29:14 +01:00
|
|
|
// NB: avoid including <iosfwd>, relatively large.
|
|
|
|
template<typename _CharT>
|
|
|
|
struct char_traits;
|
|
|
|
|
|
|
|
template<typename _CharT, typename _Traits>
|
|
|
|
class istreambuf_iterator;
|
|
|
|
|
|
|
|
template<typename _CharT, typename _Traits>
|
|
|
|
class ostreambuf_iterator;
|
|
|
|
|
2007-10-27 14:07:04 +02:00
|
|
|
template<bool _IsMove, typename _CharT>
|
2007-02-18 12:32:44 +01:00
|
|
|
typename __gnu_cxx::__enable_if<__is_char<_CharT>::__value,
|
2007-03-03 11:29:14 +01:00
|
|
|
ostreambuf_iterator<_CharT, char_traits<_CharT> > >::__type
|
2007-10-27 14:07:04 +02:00
|
|
|
__copy_move_a2(_CharT*, _CharT*,
|
|
|
|
ostreambuf_iterator<_CharT, char_traits<_CharT> >);
|
re PR libstdc++/25482 (Specialize (overload) std::copy/find for streambuf iterators)
2006-03-21 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/25482
* include/bits/stl_algobase.h (__copy_aux(_CharT*, _CharT*,
ostreambuf_iterator<_CharT>), __copy_aux(const _CharT*, const _CharT*,
ostreambuf_iterator<_CharT>), __copy_aux(istreambuf_iterator<_CharT>,
istreambuf_iterator<_CharT>, _CharT*), copy(istreambuf_iterator<_CharT>,
istreambuf_iterator<_CharT>, ostreambuf_iterator<_CharT>)): Declare.
* include/bits/stl_algo.h (find(istreambuf_iterator<_CharT>,
istreambuf_iterator<_CharT>, _CharT)): Likewise.
* include/bits/streambuf_iterator.h (copy(istreambuf_iterator<_CharT>,
istreambuf_iterator<_CharT>, ostreambuf_iterator<_CharT>),
__copy_aux(_CharT*, _CharT*, ostreambuf_iterator<_CharT>),
__copy_aux(const _CharT*, const _CharT*, ostreambuf_iterator<_CharT>),
__copy_aux(istreambuf_iterator<_CharT>, istreambuf_iterator<_CharT>,
_CharT*), find(istreambuf_iterator<_CharT>, istreambuf_iterator<_CharT>,
_CharT)): Define.
(class istreambuf_iterator<>, class ostreambuf_iterator<>): Declare
friends.
* include/std/std_streambuf.h (class basic_streambuf<>): Likewise.
* include/bits/cpp_type_traits.h (struct __is_char<>): Add.
* testsuite/25_algorithms/copy/streambuf_iterators/char/1.cc: New.
* testsuite/25_algorithms/copy/streambuf_iterators/char/2.cc: New.
* testsuite/25_algorithms/copy/streambuf_iterators/char/3.cc: New.
* testsuite/25_algorithms/copy/streambuf_iterators/char/4.cc: New.
* testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/1.cc: New.
* testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/2.cc: New.
* testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/3.cc: New.
* testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/4.cc: New.
* testsuite/25_algorithms/find/istreambuf_iterators/char/1.cc: New.
* testsuite/25_algorithms/find/istreambuf_iterators/char/2.cc: New.
* testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/1.cc: New.
* testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/2.cc: New.
* testsuite/performance/25_algorithms/copy_streambuf_iterators.cc: New.
* testsuite/performance/25_algorithms/find_istreambuf_iterators.cc: New.
From-SVN: r112247
2006-03-21 13:25:11 +01:00
|
|
|
|
2007-10-27 14:07:04 +02:00
|
|
|
template<bool _IsMove, typename _CharT>
|
2006-09-18 15:30:56 +02:00
|
|
|
typename __gnu_cxx::__enable_if<__is_char<_CharT>::__value,
|
2007-03-03 11:29:14 +01:00
|
|
|
ostreambuf_iterator<_CharT, char_traits<_CharT> > >::__type
|
2007-10-27 14:07:04 +02:00
|
|
|
__copy_move_a2(const _CharT*, const _CharT*,
|
|
|
|
ostreambuf_iterator<_CharT, char_traits<_CharT> >);
|
re PR libstdc++/25482 (Specialize (overload) std::copy/find for streambuf iterators)
2006-03-21 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/25482
* include/bits/stl_algobase.h (__copy_aux(_CharT*, _CharT*,
ostreambuf_iterator<_CharT>), __copy_aux(const _CharT*, const _CharT*,
ostreambuf_iterator<_CharT>), __copy_aux(istreambuf_iterator<_CharT>,
istreambuf_iterator<_CharT>, _CharT*), copy(istreambuf_iterator<_CharT>,
istreambuf_iterator<_CharT>, ostreambuf_iterator<_CharT>)): Declare.
* include/bits/stl_algo.h (find(istreambuf_iterator<_CharT>,
istreambuf_iterator<_CharT>, _CharT)): Likewise.
* include/bits/streambuf_iterator.h (copy(istreambuf_iterator<_CharT>,
istreambuf_iterator<_CharT>, ostreambuf_iterator<_CharT>),
__copy_aux(_CharT*, _CharT*, ostreambuf_iterator<_CharT>),
__copy_aux(const _CharT*, const _CharT*, ostreambuf_iterator<_CharT>),
__copy_aux(istreambuf_iterator<_CharT>, istreambuf_iterator<_CharT>,
_CharT*), find(istreambuf_iterator<_CharT>, istreambuf_iterator<_CharT>,
_CharT)): Define.
(class istreambuf_iterator<>, class ostreambuf_iterator<>): Declare
friends.
* include/std/std_streambuf.h (class basic_streambuf<>): Likewise.
* include/bits/cpp_type_traits.h (struct __is_char<>): Add.
* testsuite/25_algorithms/copy/streambuf_iterators/char/1.cc: New.
* testsuite/25_algorithms/copy/streambuf_iterators/char/2.cc: New.
* testsuite/25_algorithms/copy/streambuf_iterators/char/3.cc: New.
* testsuite/25_algorithms/copy/streambuf_iterators/char/4.cc: New.
* testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/1.cc: New.
* testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/2.cc: New.
* testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/3.cc: New.
* testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/4.cc: New.
* testsuite/25_algorithms/find/istreambuf_iterators/char/1.cc: New.
* testsuite/25_algorithms/find/istreambuf_iterators/char/2.cc: New.
* testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/1.cc: New.
* testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/2.cc: New.
* testsuite/performance/25_algorithms/copy_streambuf_iterators.cc: New.
* testsuite/performance/25_algorithms/find_istreambuf_iterators.cc: New.
From-SVN: r112247
2006-03-21 13:25:11 +01:00
|
|
|
|
2007-10-27 14:07:04 +02:00
|
|
|
template<bool _IsMove, typename _CharT>
|
2007-02-18 12:32:44 +01:00
|
|
|
typename __gnu_cxx::__enable_if<__is_char<_CharT>::__value,
|
|
|
|
_CharT*>::__type
|
2007-10-27 14:07:04 +02:00
|
|
|
__copy_move_a2(istreambuf_iterator<_CharT, char_traits<_CharT> >,
|
|
|
|
istreambuf_iterator<_CharT, char_traits<_CharT> >, _CharT*);
|
|
|
|
|
|
|
|
template<bool _IsMove, typename _II, typename _OI>
|
|
|
|
inline _OI
|
|
|
|
__copy_move_a2(_II __first, _II __last, _OI __result)
|
|
|
|
{
|
2010-02-05 11:55:54 +01:00
|
|
|
return _OI(std::__copy_move_a<_IsMove>(std::__niter_base(__first),
|
|
|
|
std::__niter_base(__last),
|
|
|
|
std::__niter_base(__result)));
|
2007-10-27 14:07:04 +02:00
|
|
|
}
|
re PR libstdc++/25482 (Specialize (overload) std::copy/find for streambuf iterators)
2006-03-21 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/25482
* include/bits/stl_algobase.h (__copy_aux(_CharT*, _CharT*,
ostreambuf_iterator<_CharT>), __copy_aux(const _CharT*, const _CharT*,
ostreambuf_iterator<_CharT>), __copy_aux(istreambuf_iterator<_CharT>,
istreambuf_iterator<_CharT>, _CharT*), copy(istreambuf_iterator<_CharT>,
istreambuf_iterator<_CharT>, ostreambuf_iterator<_CharT>)): Declare.
* include/bits/stl_algo.h (find(istreambuf_iterator<_CharT>,
istreambuf_iterator<_CharT>, _CharT)): Likewise.
* include/bits/streambuf_iterator.h (copy(istreambuf_iterator<_CharT>,
istreambuf_iterator<_CharT>, ostreambuf_iterator<_CharT>),
__copy_aux(_CharT*, _CharT*, ostreambuf_iterator<_CharT>),
__copy_aux(const _CharT*, const _CharT*, ostreambuf_iterator<_CharT>),
__copy_aux(istreambuf_iterator<_CharT>, istreambuf_iterator<_CharT>,
_CharT*), find(istreambuf_iterator<_CharT>, istreambuf_iterator<_CharT>,
_CharT)): Define.
(class istreambuf_iterator<>, class ostreambuf_iterator<>): Declare
friends.
* include/std/std_streambuf.h (class basic_streambuf<>): Likewise.
* include/bits/cpp_type_traits.h (struct __is_char<>): Add.
* testsuite/25_algorithms/copy/streambuf_iterators/char/1.cc: New.
* testsuite/25_algorithms/copy/streambuf_iterators/char/2.cc: New.
* testsuite/25_algorithms/copy/streambuf_iterators/char/3.cc: New.
* testsuite/25_algorithms/copy/streambuf_iterators/char/4.cc: New.
* testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/1.cc: New.
* testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/2.cc: New.
* testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/3.cc: New.
* testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/4.cc: New.
* testsuite/25_algorithms/find/istreambuf_iterators/char/1.cc: New.
* testsuite/25_algorithms/find/istreambuf_iterators/char/2.cc: New.
* testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/1.cc: New.
* testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/2.cc: New.
* testsuite/performance/25_algorithms/copy_streambuf_iterators.cc: New.
* testsuite/performance/25_algorithms/find_istreambuf_iterators.cc: New.
From-SVN: r112247
2006-03-21 13:25:11 +01:00
|
|
|
|
2001-11-20 01:51:37 +01:00
|
|
|
/**
|
|
|
|
* @brief Copies the range [first,last) into result.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @ingroup mutating_algorithms
|
2001-11-20 01:51:37 +01:00
|
|
|
* @param first An input iterator.
|
|
|
|
* @param last An input iterator.
|
|
|
|
* @param result An output iterator.
|
|
|
|
* @return result + (first - last)
|
|
|
|
*
|
|
|
|
* This inline function will boil down to a call to @c memmove whenever
|
|
|
|
* possible. Failing that, if random access iterators are passed, then the
|
|
|
|
* loop count will be known (and therefore a candidate for compiler
|
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
|
|
|
* optimizations such as unrolling). Result may not be contained within
|
|
|
|
* [first,last); the copy_backward function should be used instead.
|
|
|
|
*
|
|
|
|
* Note that the end of the output range is permitted to be contained
|
|
|
|
* within [first,last).
|
2001-11-20 01:51:37 +01:00
|
|
|
*/
|
PR libstdc++/30449 (equal)
2007-04-30 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/30449 (equal)
* include/bits/stl_algobase.h (struct __niter_base): Add.
(copy(_II, _II, _OI), copy_backward(_BI1, _BI1, _BI2),
fill(_ForwardIterator, _ForwardIterator, const _Tp&),
fill_n(_OI, _Size, const _Tp&), equal(_II1, _II1, _II2)):
Use it.
(struct __copy_normal, __copy_backward_normal,
struct __fill_normal, struct __fill_n_normal): Remove.
(struct __equal, struct __equal_aux): Add.
* include/bits/stl_iterator.h: Add _Iterator_type typedef.
* include/bits/stl_algobase.h (__fill_aux(wchar_t*,
wchar_t*, wchar_t), __fill_n_aux(wchar_t*, _Size, wchar_t)):
Remove.
* testsuite/23_containers/requirements/sequences/dr438/vector/
constructor_1_neg.cc: Adjust dg-error line number.
* testsuite/23_containers/requirements/sequences/dr438/vector/
constructor_2_neg.cc: Likewise.
From-SVN: r124295
2007-04-30 15:10:54 +02:00
|
|
|
template<typename _II, typename _OI>
|
|
|
|
inline _OI
|
|
|
|
copy(_II __first, _II __last, _OI __result)
|
2001-07-18 19:09:02 +02:00
|
|
|
{
|
|
|
|
// concept requirements
|
PR libstdc++/30449 (equal)
2007-04-30 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/30449 (equal)
* include/bits/stl_algobase.h (struct __niter_base): Add.
(copy(_II, _II, _OI), copy_backward(_BI1, _BI1, _BI2),
fill(_ForwardIterator, _ForwardIterator, const _Tp&),
fill_n(_OI, _Size, const _Tp&), equal(_II1, _II1, _II2)):
Use it.
(struct __copy_normal, __copy_backward_normal,
struct __fill_normal, struct __fill_n_normal): Remove.
(struct __equal, struct __equal_aux): Add.
* include/bits/stl_iterator.h: Add _Iterator_type typedef.
* include/bits/stl_algobase.h (__fill_aux(wchar_t*,
wchar_t*, wchar_t), __fill_n_aux(wchar_t*, _Size, wchar_t)):
Remove.
* testsuite/23_containers/requirements/sequences/dr438/vector/
constructor_1_neg.cc: Adjust dg-error line number.
* testsuite/23_containers/requirements/sequences/dr438/vector/
constructor_2_neg.cc: Likewise.
From-SVN: r124295
2007-04-30 15:10:54 +02:00
|
|
|
__glibcxx_function_requires(_InputIteratorConcept<_II>)
|
|
|
|
__glibcxx_function_requires(_OutputIteratorConcept<_OI,
|
|
|
|
typename iterator_traits<_II>::value_type>)
|
2003-11-11 21:09:16 +01:00
|
|
|
__glibcxx_requires_valid_range(__first, __last);
|
2001-07-18 19:09:02 +02:00
|
|
|
|
2007-10-27 14:07:04 +02:00
|
|
|
return (std::__copy_move_a2<__is_move_iterator<_II>::__value>
|
2010-02-05 11:55:54 +01:00
|
|
|
(std::__miter_base(__first), std::__miter_base(__last),
|
|
|
|
__result));
|
2001-07-18 19:09:02 +02:00
|
|
|
}
|
re PR libstdc++/25482 (Specialize (overload) std::copy/find for streambuf iterators)
2006-03-21 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/25482
* include/bits/stl_algobase.h (__copy_aux(_CharT*, _CharT*,
ostreambuf_iterator<_CharT>), __copy_aux(const _CharT*, const _CharT*,
ostreambuf_iterator<_CharT>), __copy_aux(istreambuf_iterator<_CharT>,
istreambuf_iterator<_CharT>, _CharT*), copy(istreambuf_iterator<_CharT>,
istreambuf_iterator<_CharT>, ostreambuf_iterator<_CharT>)): Declare.
* include/bits/stl_algo.h (find(istreambuf_iterator<_CharT>,
istreambuf_iterator<_CharT>, _CharT)): Likewise.
* include/bits/streambuf_iterator.h (copy(istreambuf_iterator<_CharT>,
istreambuf_iterator<_CharT>, ostreambuf_iterator<_CharT>),
__copy_aux(_CharT*, _CharT*, ostreambuf_iterator<_CharT>),
__copy_aux(const _CharT*, const _CharT*, ostreambuf_iterator<_CharT>),
__copy_aux(istreambuf_iterator<_CharT>, istreambuf_iterator<_CharT>,
_CharT*), find(istreambuf_iterator<_CharT>, istreambuf_iterator<_CharT>,
_CharT)): Define.
(class istreambuf_iterator<>, class ostreambuf_iterator<>): Declare
friends.
* include/std/std_streambuf.h (class basic_streambuf<>): Likewise.
* include/bits/cpp_type_traits.h (struct __is_char<>): Add.
* testsuite/25_algorithms/copy/streambuf_iterators/char/1.cc: New.
* testsuite/25_algorithms/copy/streambuf_iterators/char/2.cc: New.
* testsuite/25_algorithms/copy/streambuf_iterators/char/3.cc: New.
* testsuite/25_algorithms/copy/streambuf_iterators/char/4.cc: New.
* testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/1.cc: New.
* testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/2.cc: New.
* testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/3.cc: New.
* testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/4.cc: New.
* testsuite/25_algorithms/find/istreambuf_iterators/char/1.cc: New.
* testsuite/25_algorithms/find/istreambuf_iterators/char/2.cc: New.
* testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/1.cc: New.
* testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/2.cc: New.
* testsuite/performance/25_algorithms/copy_streambuf_iterators.cc: New.
* testsuite/performance/25_algorithms/find_istreambuf_iterators.cc: New.
From-SVN: r112247
2006-03-21 13:25:11 +01:00
|
|
|
|
stl_algobase.h (struct __cm_assign, [...]): Add.
2007-10-19 Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_algobase.h (struct __cm_assign,
struct __copy_move, struct __copy_move_backward, move,
move_backward): Add.
(struct __copy, struct __copy_backward): Remove.
(__copy_aux, __copy_backward_aux): Rename to...
(__copy_move_a, __copy_move_backward_a): ... this, and
adjust calls.
(copy, copy_backward): Adjust calls.
* include/bits/streambuf_iterator.h (__copy_aux): Rename
to ...
(__copy_move_a): ... this; add bool template parameter.
* include/std/streambuf: Adjust friend declarations.
* testsuite/util/testsuite_iterators.h
(WritableObject<>::operator=(U&&)): Add.
* testsuite/25_algorithms/move/1.cc: New.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/pod.cc: Likewise.
* testsuite/25_algorithms/move_backward/1.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/pod.cc: Likewise.
From-SVN: r129492
2007-10-19 19:04:59 +02:00
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
|
|
/**
|
|
|
|
* @brief Moves the range [first,last) into result.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @ingroup mutating_algorithms
|
stl_algobase.h (struct __cm_assign, [...]): Add.
2007-10-19 Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_algobase.h (struct __cm_assign,
struct __copy_move, struct __copy_move_backward, move,
move_backward): Add.
(struct __copy, struct __copy_backward): Remove.
(__copy_aux, __copy_backward_aux): Rename to...
(__copy_move_a, __copy_move_backward_a): ... this, and
adjust calls.
(copy, copy_backward): Adjust calls.
* include/bits/streambuf_iterator.h (__copy_aux): Rename
to ...
(__copy_move_a): ... this; add bool template parameter.
* include/std/streambuf: Adjust friend declarations.
* testsuite/util/testsuite_iterators.h
(WritableObject<>::operator=(U&&)): Add.
* testsuite/25_algorithms/move/1.cc: New.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/pod.cc: Likewise.
* testsuite/25_algorithms/move_backward/1.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/pod.cc: Likewise.
From-SVN: r129492
2007-10-19 19:04:59 +02:00
|
|
|
* @param first An input iterator.
|
|
|
|
* @param last An input iterator.
|
|
|
|
* @param result An output iterator.
|
|
|
|
* @return result + (first - last)
|
|
|
|
*
|
|
|
|
* This inline function will boil down to a call to @c memmove whenever
|
|
|
|
* possible. Failing that, if random access iterators are passed, then the
|
|
|
|
* loop count will be known (and therefore a candidate for compiler
|
|
|
|
* optimizations such as unrolling). Result may not be contained within
|
|
|
|
* [first,last); the move_backward function should be used instead.
|
|
|
|
*
|
|
|
|
* Note that the end of the output range is permitted to be contained
|
|
|
|
* within [first,last).
|
|
|
|
*/
|
|
|
|
template<typename _II, typename _OI>
|
|
|
|
inline _OI
|
|
|
|
move(_II __first, _II __last, _OI __result)
|
|
|
|
{
|
|
|
|
// concept requirements
|
|
|
|
__glibcxx_function_requires(_InputIteratorConcept<_II>)
|
|
|
|
__glibcxx_function_requires(_OutputIteratorConcept<_OI,
|
|
|
|
typename iterator_traits<_II>::value_type>)
|
|
|
|
__glibcxx_requires_valid_range(__first, __last);
|
|
|
|
|
2010-02-05 11:55:54 +01:00
|
|
|
return std::__copy_move_a2<true>(std::__miter_base(__first),
|
|
|
|
std::__miter_base(__last), __result);
|
stl_algobase.h (struct __cm_assign, [...]): Add.
2007-10-19 Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_algobase.h (struct __cm_assign,
struct __copy_move, struct __copy_move_backward, move,
move_backward): Add.
(struct __copy, struct __copy_backward): Remove.
(__copy_aux, __copy_backward_aux): Rename to...
(__copy_move_a, __copy_move_backward_a): ... this, and
adjust calls.
(copy, copy_backward): Adjust calls.
* include/bits/streambuf_iterator.h (__copy_aux): Rename
to ...
(__copy_move_a): ... this; add bool template parameter.
* include/std/streambuf: Adjust friend declarations.
* testsuite/util/testsuite_iterators.h
(WritableObject<>::operator=(U&&)): Add.
* testsuite/25_algorithms/move/1.cc: New.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/pod.cc: Likewise.
* testsuite/25_algorithms/move_backward/1.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/pod.cc: Likewise.
From-SVN: r129492
2007-10-19 19:04:59 +02:00
|
|
|
}
|
2007-10-29 02:59:49 +01:00
|
|
|
|
|
|
|
#define _GLIBCXX_MOVE3(_Tp, _Up, _Vp) std::move(_Tp, _Up, _Vp)
|
|
|
|
#else
|
|
|
|
#define _GLIBCXX_MOVE3(_Tp, _Up, _Vp) std::copy(_Tp, _Up, _Vp)
|
stl_algobase.h (struct __cm_assign, [...]): Add.
2007-10-19 Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_algobase.h (struct __cm_assign,
struct __copy_move, struct __copy_move_backward, move,
move_backward): Add.
(struct __copy, struct __copy_backward): Remove.
(__copy_aux, __copy_backward_aux): Rename to...
(__copy_move_a, __copy_move_backward_a): ... this, and
adjust calls.
(copy, copy_backward): Adjust calls.
* include/bits/streambuf_iterator.h (__copy_aux): Rename
to ...
(__copy_move_a): ... this; add bool template parameter.
* include/std/streambuf: Adjust friend declarations.
* testsuite/util/testsuite_iterators.h
(WritableObject<>::operator=(U&&)): Add.
* testsuite/25_algorithms/move/1.cc: New.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/pod.cc: Likewise.
* testsuite/25_algorithms/move_backward/1.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/pod.cc: Likewise.
From-SVN: r129492
2007-10-19 19:04:59 +02:00
|
|
|
#endif
|
PR libstdc++/30449 (equal)
2007-04-30 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/30449 (equal)
* include/bits/stl_algobase.h (struct __niter_base): Add.
(copy(_II, _II, _OI), copy_backward(_BI1, _BI1, _BI2),
fill(_ForwardIterator, _ForwardIterator, const _Tp&),
fill_n(_OI, _Size, const _Tp&), equal(_II1, _II1, _II2)):
Use it.
(struct __copy_normal, __copy_backward_normal,
struct __fill_normal, struct __fill_n_normal): Remove.
(struct __equal, struct __equal_aux): Add.
* include/bits/stl_iterator.h: Add _Iterator_type typedef.
* include/bits/stl_algobase.h (__fill_aux(wchar_t*,
wchar_t*, wchar_t), __fill_n_aux(wchar_t*, _Size, wchar_t)):
Remove.
* testsuite/23_containers/requirements/sequences/dr438/vector/
constructor_1_neg.cc: Adjust dg-error line number.
* testsuite/23_containers/requirements/sequences/dr438/vector/
constructor_2_neg.cc: Likewise.
From-SVN: r124295
2007-04-30 15:10:54 +02:00
|
|
|
|
re PR libstdc++/34595 (std::copy copies the output iterator before assigning)
2007-12-26 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/34595
* include/bits/stl_algobase.h (struct __cm_assign): Remove.
(struct __copy_move<true, false, _Category>,
struct __copy_move<true, false, random_access_iterator_tag>,
struct __copy_move_backward<true, false, _Category>,
struct __copy_move_backward<true, false, random_access_iterator_tag>):
Add.
(struct __copy_move, struct __copy_move_backward,
struct __copy_move<false, false, random_access_iterator_tag>,
struct __copy_move_backward<false, false, random_access_iterator_tag>):
Adjust.
* testsuite/25_algorithms/copy/34595.C: New.
From-SVN: r131188
2007-12-26 22:58:49 +01:00
|
|
|
template<bool, bool, typename>
|
stl_algobase.h (struct __cm_assign, [...]): Add.
2007-10-19 Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_algobase.h (struct __cm_assign,
struct __copy_move, struct __copy_move_backward, move,
move_backward): Add.
(struct __copy, struct __copy_backward): Remove.
(__copy_aux, __copy_backward_aux): Rename to...
(__copy_move_a, __copy_move_backward_a): ... this, and
adjust calls.
(copy, copy_backward): Adjust calls.
* include/bits/streambuf_iterator.h (__copy_aux): Rename
to ...
(__copy_move_a): ... this; add bool template parameter.
* include/std/streambuf: Adjust friend declarations.
* testsuite/util/testsuite_iterators.h
(WritableObject<>::operator=(U&&)): Add.
* testsuite/25_algorithms/move/1.cc: New.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/pod.cc: Likewise.
* testsuite/25_algorithms/move_backward/1.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/pod.cc: Likewise.
From-SVN: r129492
2007-10-19 19:04:59 +02:00
|
|
|
struct __copy_move_backward
|
2004-06-30 11:20:18 +02:00
|
|
|
{
|
|
|
|
template<typename _BI1, typename _BI2>
|
|
|
|
static _BI2
|
stl_algobase.h (struct __cm_assign, [...]): Add.
2007-10-19 Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_algobase.h (struct __cm_assign,
struct __copy_move, struct __copy_move_backward, move,
move_backward): Add.
(struct __copy, struct __copy_backward): Remove.
(__copy_aux, __copy_backward_aux): Rename to...
(__copy_move_a, __copy_move_backward_a): ... this, and
adjust calls.
(copy, copy_backward): Adjust calls.
* include/bits/streambuf_iterator.h (__copy_aux): Rename
to ...
(__copy_move_a): ... this; add bool template parameter.
* include/std/streambuf: Adjust friend declarations.
* testsuite/util/testsuite_iterators.h
(WritableObject<>::operator=(U&&)): Add.
* testsuite/25_algorithms/move/1.cc: New.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/pod.cc: Likewise.
* testsuite/25_algorithms/move_backward/1.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/pod.cc: Likewise.
From-SVN: r129492
2007-10-19 19:04:59 +02:00
|
|
|
__copy_move_b(_BI1 __first, _BI1 __last, _BI2 __result)
|
|
|
|
{
|
2004-06-30 11:20:18 +02:00
|
|
|
while (__first != __last)
|
re PR libstdc++/34595 (std::copy copies the output iterator before assigning)
2007-12-26 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/34595
* include/bits/stl_algobase.h (struct __cm_assign): Remove.
(struct __copy_move<true, false, _Category>,
struct __copy_move<true, false, random_access_iterator_tag>,
struct __copy_move_backward<true, false, _Category>,
struct __copy_move_backward<true, false, random_access_iterator_tag>):
Add.
(struct __copy_move, struct __copy_move_backward,
struct __copy_move<false, false, random_access_iterator_tag>,
struct __copy_move_backward<false, false, random_access_iterator_tag>):
Adjust.
* testsuite/25_algorithms/copy/34595.C: New.
From-SVN: r131188
2007-12-26 22:58:49 +01:00
|
|
|
*--__result = *--__last;
|
2004-06-30 11:20:18 +02:00
|
|
|
return __result;
|
|
|
|
}
|
2001-07-18 19:09:02 +02:00
|
|
|
};
|
|
|
|
|
re PR libstdc++/34595 (std::copy copies the output iterator before assigning)
2007-12-26 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/34595
* include/bits/stl_algobase.h (struct __cm_assign): Remove.
(struct __copy_move<true, false, _Category>,
struct __copy_move<true, false, random_access_iterator_tag>,
struct __copy_move_backward<true, false, _Category>,
struct __copy_move_backward<true, false, random_access_iterator_tag>):
Add.
(struct __copy_move, struct __copy_move_backward,
struct __copy_move<false, false, random_access_iterator_tag>,
struct __copy_move_backward<false, false, random_access_iterator_tag>):
Adjust.
* testsuite/25_algorithms/copy/34595.C: New.
From-SVN: r131188
2007-12-26 22:58:49 +01:00
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
|
|
template<typename _Category>
|
|
|
|
struct __copy_move_backward<true, false, _Category>
|
|
|
|
{
|
|
|
|
template<typename _BI1, typename _BI2>
|
|
|
|
static _BI2
|
|
|
|
__copy_move_b(_BI1 __first, _BI1 __last, _BI2 __result)
|
|
|
|
{
|
|
|
|
while (__first != __last)
|
|
|
|
*--__result = std::move(*--__last);
|
|
|
|
return __result;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
#endif
|
|
|
|
|
|
|
|
template<>
|
|
|
|
struct __copy_move_backward<false, false, random_access_iterator_tag>
|
2004-06-30 11:20:18 +02:00
|
|
|
{
|
|
|
|
template<typename _BI1, typename _BI2>
|
|
|
|
static _BI2
|
stl_algobase.h (struct __cm_assign, [...]): Add.
2007-10-19 Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_algobase.h (struct __cm_assign,
struct __copy_move, struct __copy_move_backward, move,
move_backward): Add.
(struct __copy, struct __copy_backward): Remove.
(__copy_aux, __copy_backward_aux): Rename to...
(__copy_move_a, __copy_move_backward_a): ... this, and
adjust calls.
(copy, copy_backward): Adjust calls.
* include/bits/streambuf_iterator.h (__copy_aux): Rename
to ...
(__copy_move_a): ... this; add bool template parameter.
* include/std/streambuf: Adjust friend declarations.
* testsuite/util/testsuite_iterators.h
(WritableObject<>::operator=(U&&)): Add.
* testsuite/25_algorithms/move/1.cc: New.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/pod.cc: Likewise.
* testsuite/25_algorithms/move_backward/1.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/pod.cc: Likewise.
From-SVN: r129492
2007-10-19 19:04:59 +02:00
|
|
|
__copy_move_b(_BI1 __first, _BI1 __last, _BI2 __result)
|
|
|
|
{
|
2004-06-30 11:20:18 +02:00
|
|
|
typename iterator_traits<_BI1>::difference_type __n;
|
|
|
|
for (__n = __last - __first; __n > 0; --__n)
|
re PR libstdc++/34595 (std::copy copies the output iterator before assigning)
2007-12-26 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/34595
* include/bits/stl_algobase.h (struct __cm_assign): Remove.
(struct __copy_move<true, false, _Category>,
struct __copy_move<true, false, random_access_iterator_tag>,
struct __copy_move_backward<true, false, _Category>,
struct __copy_move_backward<true, false, random_access_iterator_tag>):
Add.
(struct __copy_move, struct __copy_move_backward,
struct __copy_move<false, false, random_access_iterator_tag>,
struct __copy_move_backward<false, false, random_access_iterator_tag>):
Adjust.
* testsuite/25_algorithms/copy/34595.C: New.
From-SVN: r131188
2007-12-26 22:58:49 +01:00
|
|
|
*--__result = *--__last;
|
2004-06-30 11:20:18 +02:00
|
|
|
return __result;
|
|
|
|
}
|
2001-07-18 19:09:02 +02:00
|
|
|
};
|
|
|
|
|
re PR libstdc++/34595 (std::copy copies the output iterator before assigning)
2007-12-26 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/34595
* include/bits/stl_algobase.h (struct __cm_assign): Remove.
(struct __copy_move<true, false, _Category>,
struct __copy_move<true, false, random_access_iterator_tag>,
struct __copy_move_backward<true, false, _Category>,
struct __copy_move_backward<true, false, random_access_iterator_tag>):
Add.
(struct __copy_move, struct __copy_move_backward,
struct __copy_move<false, false, random_access_iterator_tag>,
struct __copy_move_backward<false, false, random_access_iterator_tag>):
Adjust.
* testsuite/25_algorithms/copy/34595.C: New.
From-SVN: r131188
2007-12-26 22:58:49 +01:00
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
|
|
template<>
|
|
|
|
struct __copy_move_backward<true, false, random_access_iterator_tag>
|
|
|
|
{
|
|
|
|
template<typename _BI1, typename _BI2>
|
|
|
|
static _BI2
|
|
|
|
__copy_move_b(_BI1 __first, _BI1 __last, _BI2 __result)
|
|
|
|
{
|
|
|
|
typename iterator_traits<_BI1>::difference_type __n;
|
|
|
|
for (__n = __last - __first; __n > 0; --__n)
|
|
|
|
*--__result = std::move(*--__last);
|
|
|
|
return __result;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
#endif
|
|
|
|
|
2007-10-27 14:07:04 +02:00
|
|
|
template<bool _IsMove>
|
|
|
|
struct __copy_move_backward<_IsMove, true, random_access_iterator_tag>
|
2004-06-30 11:20:18 +02:00
|
|
|
{
|
|
|
|
template<typename _Tp>
|
|
|
|
static _Tp*
|
stl_algobase.h (struct __cm_assign, [...]): Add.
2007-10-19 Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_algobase.h (struct __cm_assign,
struct __copy_move, struct __copy_move_backward, move,
move_backward): Add.
(struct __copy, struct __copy_backward): Remove.
(__copy_aux, __copy_backward_aux): Rename to...
(__copy_move_a, __copy_move_backward_a): ... this, and
adjust calls.
(copy, copy_backward): Adjust calls.
* include/bits/streambuf_iterator.h (__copy_aux): Rename
to ...
(__copy_move_a): ... this; add bool template parameter.
* include/std/streambuf: Adjust friend declarations.
* testsuite/util/testsuite_iterators.h
(WritableObject<>::operator=(U&&)): Add.
* testsuite/25_algorithms/move/1.cc: New.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/pod.cc: Likewise.
* testsuite/25_algorithms/move_backward/1.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/pod.cc: Likewise.
From-SVN: r129492
2007-10-19 19:04:59 +02:00
|
|
|
__copy_move_b(const _Tp* __first, const _Tp* __last, _Tp* __result)
|
|
|
|
{
|
2004-06-30 11:20:18 +02:00
|
|
|
const ptrdiff_t _Num = __last - __first;
|
2009-09-06 17:41:38 +02:00
|
|
|
if (_Num)
|
|
|
|
__builtin_memmove(__result - _Num, __first, sizeof(_Tp) * _Num);
|
2004-06-30 11:20:18 +02:00
|
|
|
return __result - _Num;
|
|
|
|
}
|
2001-07-18 19:09:02 +02:00
|
|
|
};
|
|
|
|
|
2007-10-27 14:07:04 +02:00
|
|
|
template<bool _IsMove, typename _BI1, typename _BI2>
|
2001-07-18 19:09:02 +02:00
|
|
|
inline _BI2
|
stl_algobase.h (struct __cm_assign, [...]): Add.
2007-10-19 Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_algobase.h (struct __cm_assign,
struct __copy_move, struct __copy_move_backward, move,
move_backward): Add.
(struct __copy, struct __copy_backward): Remove.
(__copy_aux, __copy_backward_aux): Rename to...
(__copy_move_a, __copy_move_backward_a): ... this, and
adjust calls.
(copy, copy_backward): Adjust calls.
* include/bits/streambuf_iterator.h (__copy_aux): Rename
to ...
(__copy_move_a): ... this; add bool template parameter.
* include/std/streambuf: Adjust friend declarations.
* testsuite/util/testsuite_iterators.h
(WritableObject<>::operator=(U&&)): Add.
* testsuite/25_algorithms/move/1.cc: New.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/pod.cc: Likewise.
* testsuite/25_algorithms/move_backward/1.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/pod.cc: Likewise.
From-SVN: r129492
2007-10-19 19:04:59 +02:00
|
|
|
__copy_move_backward_a(_BI1 __first, _BI1 __last, _BI2 __result)
|
2001-07-18 19:09:02 +02:00
|
|
|
{
|
2004-07-01 19:53:21 +02:00
|
|
|
typedef typename iterator_traits<_BI1>::value_type _ValueType1;
|
|
|
|
typedef typename iterator_traits<_BI2>::value_type _ValueType2;
|
2004-06-30 11:20:18 +02:00
|
|
|
typedef typename iterator_traits<_BI1>::iterator_category _Category;
|
2010-06-17 10:34:17 +02:00
|
|
|
const bool __simple = (__is_trivial(_ValueType1)
|
2005-02-01 14:30:34 +01:00
|
|
|
&& __is_pointer<_BI1>::__value
|
|
|
|
&& __is_pointer<_BI2>::__value
|
|
|
|
&& __are_same<_ValueType1, _ValueType2>::__value);
|
2004-06-30 11:20:18 +02:00
|
|
|
|
2007-10-27 14:07:04 +02:00
|
|
|
return std::__copy_move_backward<_IsMove, __simple,
|
stl_algobase.h (struct __cm_assign, [...]): Add.
2007-10-19 Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_algobase.h (struct __cm_assign,
struct __copy_move, struct __copy_move_backward, move,
move_backward): Add.
(struct __copy, struct __copy_backward): Remove.
(__copy_aux, __copy_backward_aux): Rename to...
(__copy_move_a, __copy_move_backward_a): ... this, and
adjust calls.
(copy, copy_backward): Adjust calls.
* include/bits/streambuf_iterator.h (__copy_aux): Rename
to ...
(__copy_move_a): ... this; add bool template parameter.
* include/std/streambuf: Adjust friend declarations.
* testsuite/util/testsuite_iterators.h
(WritableObject<>::operator=(U&&)): Add.
* testsuite/25_algorithms/move/1.cc: New.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/pod.cc: Likewise.
* testsuite/25_algorithms/move_backward/1.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/pod.cc: Likewise.
From-SVN: r129492
2007-10-19 19:04:59 +02:00
|
|
|
_Category>::__copy_move_b(__first,
|
stl_algobase.h (__copy_normal::copy_n): Uglify to __copy_n.
2005-12-18 Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_algobase.h (__copy_normal::copy_n): Uglify
to __copy_n.
(__copy_backward::copy_b): Likewise to __copy_b.
(__copy_backward_normal::copy_b_n): Likewise to __copy_b_n.
(copy, __copy_backward_aux, copy_backward): Adjust.
2005-12-18 Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_algo.h (partial_sort_copy): Add
_BinaryPredicateConcept<_Compare, _InputValueType, _OutputValueType>
(merge, set_union, set_symmetric_difference): Add
_OutputIteratorConcept<_OutputIterator, _ValueType2>.
(binary_search): Remove redundant _BinaryPredicateConcept<_Compare,
_ValueType, _Tp>, taken care by lower_bound.
* include/bits/stl_algo.h: Cosmetic changes.
2005-12-18 Paolo Carlini <pcarlini@suse.de>
Howard Hinnant <hhinnant@apple.com>
* include/bits/stl_algo.h (merge, includes, set_union,
set_intersection, set_difference, set_symmetric_difference):
Fix concept checks.
2005-12-18 Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_algo.h (partial_sort_copy, lower_bound,
upper_bound, equal_range, binary_search): Fix concept checks.
Co-Authored-By: Howard Hinnant <hhinnant@apple.com>
From-SVN: r108758
2005-12-18 16:53:10 +01:00
|
|
|
__last,
|
|
|
|
__result);
|
2001-07-18 19:09:02 +02:00
|
|
|
}
|
|
|
|
|
2007-10-27 14:07:04 +02:00
|
|
|
template<bool _IsMove, typename _BI1, typename _BI2>
|
|
|
|
inline _BI2
|
|
|
|
__copy_move_backward_a2(_BI1 __first, _BI1 __last, _BI2 __result)
|
|
|
|
{
|
|
|
|
return _BI2(std::__copy_move_backward_a<_IsMove>
|
2010-02-05 11:55:54 +01:00
|
|
|
(std::__niter_base(__first), std::__niter_base(__last),
|
|
|
|
std::__niter_base(__result)));
|
2007-10-27 14:07:04 +02:00
|
|
|
}
|
|
|
|
|
2001-11-20 01:51:37 +01:00
|
|
|
/**
|
|
|
|
* @brief Copies the range [first,last) into result.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @ingroup mutating_algorithms
|
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
|
|
|
* @param first A bidirectional iterator.
|
|
|
|
* @param last A bidirectional iterator.
|
|
|
|
* @param result A bidirectional iterator.
|
2001-11-20 01:51:37 +01:00
|
|
|
* @return result - (first - last)
|
|
|
|
*
|
|
|
|
* The function has the same effect as copy, but starts at the end of the
|
|
|
|
* range and works its way to the start, returning the start of the result.
|
|
|
|
* This inline function will boil down to a call to @c memmove whenever
|
|
|
|
* possible. Failing that, if random access iterators are passed, then the
|
|
|
|
* loop count will be known (and therefore a candidate for compiler
|
|
|
|
* optimizations such as unrolling).
|
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
|
|
|
*
|
|
|
|
* Result may not be in the range [first,last). Use copy instead. Note
|
|
|
|
* that the start of the output range may overlap [first,last).
|
2001-11-20 01:51:37 +01:00
|
|
|
*/
|
2007-10-27 14:07:04 +02:00
|
|
|
template<typename _BI1, typename _BI2>
|
2001-07-18 19:09:02 +02:00
|
|
|
inline _BI2
|
|
|
|
copy_backward(_BI1 __first, _BI1 __last, _BI2 __result)
|
|
|
|
{
|
|
|
|
// concept requirements
|
2003-07-05 06:05:45 +02:00
|
|
|
__glibcxx_function_requires(_BidirectionalIteratorConcept<_BI1>)
|
|
|
|
__glibcxx_function_requires(_Mutable_BidirectionalIteratorConcept<_BI2>)
|
|
|
|
__glibcxx_function_requires(_ConvertibleConcept<
|
2001-07-18 19:09:02 +02:00
|
|
|
typename iterator_traits<_BI1>::value_type,
|
2001-11-01 16:46:48 +01:00
|
|
|
typename iterator_traits<_BI2>::value_type>)
|
2003-11-11 21:09:16 +01:00
|
|
|
__glibcxx_requires_valid_range(__first, __last);
|
2001-07-18 19:09:02 +02:00
|
|
|
|
2007-10-27 14:07:04 +02:00
|
|
|
return (std::__copy_move_backward_a2<__is_move_iterator<_BI1>::__value>
|
2010-02-05 11:55:54 +01:00
|
|
|
(std::__miter_base(__first), std::__miter_base(__last),
|
|
|
|
__result));
|
2001-07-18 19:09:02 +02:00
|
|
|
}
|
|
|
|
|
stl_algobase.h (struct __cm_assign, [...]): Add.
2007-10-19 Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_algobase.h (struct __cm_assign,
struct __copy_move, struct __copy_move_backward, move,
move_backward): Add.
(struct __copy, struct __copy_backward): Remove.
(__copy_aux, __copy_backward_aux): Rename to...
(__copy_move_a, __copy_move_backward_a): ... this, and
adjust calls.
(copy, copy_backward): Adjust calls.
* include/bits/streambuf_iterator.h (__copy_aux): Rename
to ...
(__copy_move_a): ... this; add bool template parameter.
* include/std/streambuf: Adjust friend declarations.
* testsuite/util/testsuite_iterators.h
(WritableObject<>::operator=(U&&)): Add.
* testsuite/25_algorithms/move/1.cc: New.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/pod.cc: Likewise.
* testsuite/25_algorithms/move_backward/1.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/pod.cc: Likewise.
From-SVN: r129492
2007-10-19 19:04:59 +02:00
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
|
|
/**
|
|
|
|
* @brief Moves the range [first,last) into result.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @ingroup mutating_algorithms
|
stl_algobase.h (struct __cm_assign, [...]): Add.
2007-10-19 Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_algobase.h (struct __cm_assign,
struct __copy_move, struct __copy_move_backward, move,
move_backward): Add.
(struct __copy, struct __copy_backward): Remove.
(__copy_aux, __copy_backward_aux): Rename to...
(__copy_move_a, __copy_move_backward_a): ... this, and
adjust calls.
(copy, copy_backward): Adjust calls.
* include/bits/streambuf_iterator.h (__copy_aux): Rename
to ...
(__copy_move_a): ... this; add bool template parameter.
* include/std/streambuf: Adjust friend declarations.
* testsuite/util/testsuite_iterators.h
(WritableObject<>::operator=(U&&)): Add.
* testsuite/25_algorithms/move/1.cc: New.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/pod.cc: Likewise.
* testsuite/25_algorithms/move_backward/1.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/pod.cc: Likewise.
From-SVN: r129492
2007-10-19 19:04:59 +02:00
|
|
|
* @param first A bidirectional iterator.
|
|
|
|
* @param last A bidirectional iterator.
|
|
|
|
* @param result A bidirectional iterator.
|
|
|
|
* @return result - (first - last)
|
|
|
|
*
|
|
|
|
* The function has the same effect as move, but starts at the end of the
|
|
|
|
* range and works its way to the start, returning the start of the result.
|
|
|
|
* This inline function will boil down to a call to @c memmove whenever
|
|
|
|
* possible. Failing that, if random access iterators are passed, then the
|
|
|
|
* loop count will be known (and therefore a candidate for compiler
|
|
|
|
* optimizations such as unrolling).
|
|
|
|
*
|
|
|
|
* Result may not be in the range [first,last). Use move instead. Note
|
|
|
|
* that the start of the output range may overlap [first,last).
|
|
|
|
*/
|
|
|
|
template<typename _BI1, typename _BI2>
|
|
|
|
inline _BI2
|
|
|
|
move_backward(_BI1 __first, _BI1 __last, _BI2 __result)
|
|
|
|
{
|
|
|
|
// concept requirements
|
|
|
|
__glibcxx_function_requires(_BidirectionalIteratorConcept<_BI1>)
|
|
|
|
__glibcxx_function_requires(_Mutable_BidirectionalIteratorConcept<_BI2>)
|
|
|
|
__glibcxx_function_requires(_ConvertibleConcept<
|
|
|
|
typename iterator_traits<_BI1>::value_type,
|
|
|
|
typename iterator_traits<_BI2>::value_type>)
|
|
|
|
__glibcxx_requires_valid_range(__first, __last);
|
|
|
|
|
2010-02-05 11:55:54 +01:00
|
|
|
return std::__copy_move_backward_a2<true>(std::__miter_base(__first),
|
|
|
|
std::__miter_base(__last),
|
|
|
|
__result);
|
stl_algobase.h (struct __cm_assign, [...]): Add.
2007-10-19 Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_algobase.h (struct __cm_assign,
struct __copy_move, struct __copy_move_backward, move,
move_backward): Add.
(struct __copy, struct __copy_backward): Remove.
(__copy_aux, __copy_backward_aux): Rename to...
(__copy_move_a, __copy_move_backward_a): ... this, and
adjust calls.
(copy, copy_backward): Adjust calls.
* include/bits/streambuf_iterator.h (__copy_aux): Rename
to ...
(__copy_move_a): ... this; add bool template parameter.
* include/std/streambuf: Adjust friend declarations.
* testsuite/util/testsuite_iterators.h
(WritableObject<>::operator=(U&&)): Add.
* testsuite/25_algorithms/move/1.cc: New.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/pod.cc: Likewise.
* testsuite/25_algorithms/move_backward/1.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/pod.cc: Likewise.
From-SVN: r129492
2007-10-19 19:04:59 +02:00
|
|
|
}
|
2007-10-29 02:59:49 +01:00
|
|
|
|
|
|
|
#define _GLIBCXX_MOVE_BACKWARD3(_Tp, _Up, _Vp) std::move_backward(_Tp, _Up, _Vp)
|
|
|
|
#else
|
|
|
|
#define _GLIBCXX_MOVE_BACKWARD3(_Tp, _Up, _Vp) std::copy_backward(_Tp, _Up, _Vp)
|
stl_algobase.h (struct __cm_assign, [...]): Add.
2007-10-19 Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_algobase.h (struct __cm_assign,
struct __copy_move, struct __copy_move_backward, move,
move_backward): Add.
(struct __copy, struct __copy_backward): Remove.
(__copy_aux, __copy_backward_aux): Rename to...
(__copy_move_a, __copy_move_backward_a): ... this, and
adjust calls.
(copy, copy_backward): Adjust calls.
* include/bits/streambuf_iterator.h (__copy_aux): Rename
to ...
(__copy_move_a): ... this; add bool template parameter.
* include/std/streambuf: Adjust friend declarations.
* testsuite/util/testsuite_iterators.h
(WritableObject<>::operator=(U&&)): Add.
* testsuite/25_algorithms/move/1.cc: New.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move/requirements/
explicit_instantiation/pod.cc: Likewise.
* testsuite/25_algorithms/move_backward/1.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/2.cc: Likewise.
* testsuite/25_algorithms/move_backward/requirements/
explicit_instantiation/pod.cc: Likewise.
From-SVN: r129492
2007-10-19 19:04:59 +02:00
|
|
|
#endif
|
PR libstdc++/30449 (fill, fill_n)
2007-01-21 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/30449 (fill, fill_n)
* include/bits/stl_algobase.h (__fill_aux(wchar_t*, wchar_t*,
const wchar_t&), __fill_n_aux(wchar_t*, _Size, const wchar_t&)): New.
(fill(signed char*, signed char*, const signed char&),
fill(unsigned char*, unsigned char*, const unsigned char&),
fill(char*, char*, char&), fill_n(signed char*, _Size,
const signed char&), fill_n(unsigned char*, _Size,
const unsigned char&), fill_n(char*, _Size, char&)): Rename to
__*_aux.
(__fill_normal, __fill_n_normal): New, call the latter.
(fill, fill_n): Adjust, call the latter.
* testsuite/25_algorithms/fill/4.cc: New.
* testsuite/25_algorithms/fill/5.cc: New.
From-SVN: r121027
2007-01-21 10:57:42 +01:00
|
|
|
|
2007-10-17 23:21:13 +02:00
|
|
|
template<typename _ForwardIterator, typename _Tp>
|
|
|
|
inline typename
|
|
|
|
__gnu_cxx::__enable_if<!__is_scalar<_Tp>::__value, void>::__type
|
|
|
|
__fill_a(_ForwardIterator __first, _ForwardIterator __last,
|
|
|
|
const _Tp& __value)
|
2004-06-25 11:25:57 +02:00
|
|
|
{
|
2007-10-17 23:21:13 +02:00
|
|
|
for (; __first != __last; ++__first)
|
|
|
|
*__first = __value;
|
|
|
|
}
|
|
|
|
|
BUGS: Update from 2.90.8 snapshot.
2003-06-10 Phil Edwards <pme@gcc.gnu.org>
* docs/html/17_intro/BUGS: Update from 2.90.8 snapshot.
* docs/html/17_intro/CHECKLIST: Bring up to date with respect to
correctness of container::iterator typedefs. Fix whitespace.
* docs/html/20_util/howto.html, docs/html/ext/howto.html: Add links
to allocator docs.
* docs/html/documentation.html: Regenerate.
* include/bits/basic_string.h, include/bits/basic_string.tcc,
include/bits/deque.tcc, include/bits/list.tcc, include/bits/stl_algo.h,
include/bits/stl_algobase.h, include/bits/stl_bvector.h,
include/bits/stl_deque.h, include/bits/stl_iterator_base_funcs.h,
include/bits/stl_list.h, include/bits/stl_uninitialized.h,
include/bits/stl_vector.h, include/bits/vector.tcc,
include/ext/algorithm, include/ext/slist, include/std/std_bitset.h:
Change _Iter names to _Iterator, and __pos to __position.
* include/bits/stl_relops.h, include/bits/stl_numeric.h,
include/bits/stl_multiset.h, include/bits/stl_set.h:
Remove emacs markers.
* include/bits/stl_threads.h (_STL_auto_lock): Add __unused__.
From-SVN: r67736
2003-06-10 23:52:25 +02:00
|
|
|
template<typename _ForwardIterator, typename _Tp>
|
2007-10-17 23:21:13 +02:00
|
|
|
inline typename
|
|
|
|
__gnu_cxx::__enable_if<__is_scalar<_Tp>::__value, void>::__type
|
re PR libstdc++/35725 (ambiguous std::fill with character array)
2008-03-29 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/35725
* include/bits/stl_algobase.h (__fill_a(_ForwardIterator,
_ForwardIterator, _Tp), __fill_a(_Tp*, _Tp*, _Tp),
__fill_n_a(_OutputIterator, _Size, _Tp), __fill_n_a(_Tp*, _Size,
_Tp)): Fix signatures.
* testsuite/25_algorithms/fill/35725.cc: New.
* testsuite/25_algorithms/fill_n/35725.cc: Likewise.
From-SVN: r133721
2008-03-29 23:38:19 +01:00
|
|
|
__fill_a(_ForwardIterator __first, _ForwardIterator __last,
|
|
|
|
const _Tp& __value)
|
2001-07-18 19:09:02 +02:00
|
|
|
{
|
re PR libstdc++/35725 (ambiguous std::fill with character array)
2008-03-29 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/35725
* include/bits/stl_algobase.h (__fill_a(_ForwardIterator,
_ForwardIterator, _Tp), __fill_a(_Tp*, _Tp*, _Tp),
__fill_n_a(_OutputIterator, _Size, _Tp), __fill_n_a(_Tp*, _Size,
_Tp)): Fix signatures.
* testsuite/25_algorithms/fill/35725.cc: New.
* testsuite/25_algorithms/fill_n/35725.cc: Likewise.
From-SVN: r133721
2008-03-29 23:38:19 +01:00
|
|
|
const _Tp __tmp = __value;
|
2007-10-17 23:21:13 +02:00
|
|
|
for (; __first != __last; ++__first)
|
re PR libstdc++/35725 (ambiguous std::fill with character array)
2008-03-29 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/35725
* include/bits/stl_algobase.h (__fill_a(_ForwardIterator,
_ForwardIterator, _Tp), __fill_a(_Tp*, _Tp*, _Tp),
__fill_n_a(_OutputIterator, _Size, _Tp), __fill_n_a(_Tp*, _Size,
_Tp)): Fix signatures.
* testsuite/25_algorithms/fill/35725.cc: New.
* testsuite/25_algorithms/fill_n/35725.cc: Likewise.
From-SVN: r133721
2008-03-29 23:38:19 +01:00
|
|
|
*__first = __tmp;
|
2001-07-18 19:09:02 +02:00
|
|
|
}
|
|
|
|
|
PR libstdc++/30449 (equal)
2007-04-30 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/30449 (equal)
* include/bits/stl_algobase.h (struct __niter_base): Add.
(copy(_II, _II, _OI), copy_backward(_BI1, _BI1, _BI2),
fill(_ForwardIterator, _ForwardIterator, const _Tp&),
fill_n(_OI, _Size, const _Tp&), equal(_II1, _II1, _II2)):
Use it.
(struct __copy_normal, __copy_backward_normal,
struct __fill_normal, struct __fill_n_normal): Remove.
(struct __equal, struct __equal_aux): Add.
* include/bits/stl_iterator.h: Add _Iterator_type typedef.
* include/bits/stl_algobase.h (__fill_aux(wchar_t*,
wchar_t*, wchar_t), __fill_n_aux(wchar_t*, _Size, wchar_t)):
Remove.
* testsuite/23_containers/requirements/sequences/dr438/vector/
constructor_1_neg.cc: Adjust dg-error line number.
* testsuite/23_containers/requirements/sequences/dr438/vector/
constructor_2_neg.cc: Likewise.
From-SVN: r124295
2007-04-30 15:10:54 +02:00
|
|
|
// Specialization: for char types we can use memset.
|
2007-10-17 23:21:13 +02:00
|
|
|
template<typename _Tp>
|
|
|
|
inline typename
|
|
|
|
__gnu_cxx::__enable_if<__is_byte<_Tp>::__value, void>::__type
|
re PR libstdc++/35725 (ambiguous std::fill with character array)
2008-03-29 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/35725
* include/bits/stl_algobase.h (__fill_a(_ForwardIterator,
_ForwardIterator, _Tp), __fill_a(_Tp*, _Tp*, _Tp),
__fill_n_a(_OutputIterator, _Size, _Tp), __fill_n_a(_Tp*, _Size,
_Tp)): Fix signatures.
* testsuite/25_algorithms/fill/35725.cc: New.
* testsuite/25_algorithms/fill_n/35725.cc: Likewise.
From-SVN: r133721
2008-03-29 23:38:19 +01:00
|
|
|
__fill_a(_Tp* __first, _Tp* __last, const _Tp& __c)
|
|
|
|
{
|
|
|
|
const _Tp __tmp = __c;
|
|
|
|
__builtin_memset(__first, static_cast<unsigned char>(__tmp),
|
|
|
|
__last - __first);
|
|
|
|
}
|
2000-10-05 13:27:02 +02:00
|
|
|
|
PR libstdc++/30449 (fill, fill_n)
2007-01-21 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/30449 (fill, fill_n)
* include/bits/stl_algobase.h (__fill_aux(wchar_t*, wchar_t*,
const wchar_t&), __fill_n_aux(wchar_t*, _Size, const wchar_t&)): New.
(fill(signed char*, signed char*, const signed char&),
fill(unsigned char*, unsigned char*, const unsigned char&),
fill(char*, char*, char&), fill_n(signed char*, _Size,
const signed char&), fill_n(unsigned char*, _Size,
const unsigned char&), fill_n(char*, _Size, char&)): Rename to
__*_aux.
(__fill_normal, __fill_n_normal): New, call the latter.
(fill, fill_n): Adjust, call the latter.
* testsuite/25_algorithms/fill/4.cc: New.
* testsuite/25_algorithms/fill/5.cc: New.
From-SVN: r121027
2007-01-21 10:57:42 +01:00
|
|
|
/**
|
|
|
|
* @brief Fills the range [first,last) with copies of value.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @ingroup mutating_algorithms
|
PR libstdc++/30449 (fill, fill_n)
2007-01-21 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/30449 (fill, fill_n)
* include/bits/stl_algobase.h (__fill_aux(wchar_t*, wchar_t*,
const wchar_t&), __fill_n_aux(wchar_t*, _Size, const wchar_t&)): New.
(fill(signed char*, signed char*, const signed char&),
fill(unsigned char*, unsigned char*, const unsigned char&),
fill(char*, char*, char&), fill_n(signed char*, _Size,
const signed char&), fill_n(unsigned char*, _Size,
const unsigned char&), fill_n(char*, _Size, char&)): Rename to
__*_aux.
(__fill_normal, __fill_n_normal): New, call the latter.
(fill, fill_n): Adjust, call the latter.
* testsuite/25_algorithms/fill/4.cc: New.
* testsuite/25_algorithms/fill/5.cc: New.
From-SVN: r121027
2007-01-21 10:57:42 +01:00
|
|
|
* @param first A forward iterator.
|
|
|
|
* @param last A forward iterator.
|
|
|
|
* @param value A reference-to-const of arbitrary type.
|
|
|
|
* @return Nothing.
|
|
|
|
*
|
|
|
|
* This function fills a range with copies of the same value. For char
|
|
|
|
* types filling contiguous areas of memory, this becomes an inline call
|
|
|
|
* to @c memset or @c wmemset.
|
|
|
|
*/
|
|
|
|
template<typename _ForwardIterator, typename _Tp>
|
|
|
|
inline void
|
|
|
|
fill(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value)
|
|
|
|
{
|
|
|
|
// concept requirements
|
|
|
|
__glibcxx_function_requires(_Mutable_ForwardIteratorConcept<
|
|
|
|
_ForwardIterator>)
|
|
|
|
__glibcxx_requires_valid_range(__first, __last);
|
|
|
|
|
2010-02-05 11:55:54 +01:00
|
|
|
std::__fill_a(std::__niter_base(__first), std::__niter_base(__last),
|
|
|
|
__value);
|
PR libstdc++/30449 (fill, fill_n)
2007-01-21 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/30449 (fill, fill_n)
* include/bits/stl_algobase.h (__fill_aux(wchar_t*, wchar_t*,
const wchar_t&), __fill_n_aux(wchar_t*, _Size, const wchar_t&)): New.
(fill(signed char*, signed char*, const signed char&),
fill(unsigned char*, unsigned char*, const unsigned char&),
fill(char*, char*, char&), fill_n(signed char*, _Size,
const signed char&), fill_n(unsigned char*, _Size,
const unsigned char&), fill_n(char*, _Size, char&)): Rename to
__*_aux.
(__fill_normal, __fill_n_normal): New, call the latter.
(fill, fill_n): Adjust, call the latter.
* testsuite/25_algorithms/fill/4.cc: New.
* testsuite/25_algorithms/fill/5.cc: New.
From-SVN: r121027
2007-01-21 10:57:42 +01:00
|
|
|
}
|
|
|
|
|
2004-06-25 11:25:57 +02:00
|
|
|
template<typename _OutputIterator, typename _Size, typename _Tp>
|
2007-10-17 23:21:13 +02:00
|
|
|
inline typename
|
|
|
|
__gnu_cxx::__enable_if<!__is_scalar<_Tp>::__value, _OutputIterator>::__type
|
|
|
|
__fill_n_a(_OutputIterator __first, _Size __n, const _Tp& __value)
|
2001-07-18 19:09:02 +02:00
|
|
|
{
|
2010-05-21 18:57:17 +02:00
|
|
|
for (__decltype(__n + 0) __niter = __n;
|
|
|
|
__niter > 0; --__niter, ++__first)
|
2007-10-17 23:21:13 +02:00
|
|
|
*__first = __value;
|
|
|
|
return __first;
|
2001-07-18 19:09:02 +02:00
|
|
|
}
|
|
|
|
|
2007-10-17 23:21:13 +02:00
|
|
|
template<typename _OutputIterator, typename _Size, typename _Tp>
|
|
|
|
inline typename
|
|
|
|
__gnu_cxx::__enable_if<__is_scalar<_Tp>::__value, _OutputIterator>::__type
|
re PR libstdc++/35725 (ambiguous std::fill with character array)
2008-03-29 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/35725
* include/bits/stl_algobase.h (__fill_a(_ForwardIterator,
_ForwardIterator, _Tp), __fill_a(_Tp*, _Tp*, _Tp),
__fill_n_a(_OutputIterator, _Size, _Tp), __fill_n_a(_Tp*, _Size,
_Tp)): Fix signatures.
* testsuite/25_algorithms/fill/35725.cc: New.
* testsuite/25_algorithms/fill_n/35725.cc: Likewise.
From-SVN: r133721
2008-03-29 23:38:19 +01:00
|
|
|
__fill_n_a(_OutputIterator __first, _Size __n, const _Tp& __value)
|
2001-07-18 19:09:02 +02:00
|
|
|
{
|
re PR libstdc++/35725 (ambiguous std::fill with character array)
2008-03-29 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/35725
* include/bits/stl_algobase.h (__fill_a(_ForwardIterator,
_ForwardIterator, _Tp), __fill_a(_Tp*, _Tp*, _Tp),
__fill_n_a(_OutputIterator, _Size, _Tp), __fill_n_a(_Tp*, _Size,
_Tp)): Fix signatures.
* testsuite/25_algorithms/fill/35725.cc: New.
* testsuite/25_algorithms/fill_n/35725.cc: Likewise.
From-SVN: r133721
2008-03-29 23:38:19 +01:00
|
|
|
const _Tp __tmp = __value;
|
2010-05-21 18:57:17 +02:00
|
|
|
for (__decltype(__n + 0) __niter = __n;
|
|
|
|
__niter > 0; --__niter, ++__first)
|
re PR libstdc++/35725 (ambiguous std::fill with character array)
2008-03-29 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/35725
* include/bits/stl_algobase.h (__fill_a(_ForwardIterator,
_ForwardIterator, _Tp), __fill_a(_Tp*, _Tp*, _Tp),
__fill_n_a(_OutputIterator, _Size, _Tp), __fill_n_a(_Tp*, _Size,
_Tp)): Fix signatures.
* testsuite/25_algorithms/fill/35725.cc: New.
* testsuite/25_algorithms/fill_n/35725.cc: Likewise.
From-SVN: r133721
2008-03-29 23:38:19 +01:00
|
|
|
*__first = __tmp;
|
2007-10-17 23:21:13 +02:00
|
|
|
return __first;
|
2001-07-18 19:09:02 +02:00
|
|
|
}
|
|
|
|
|
2007-10-17 23:21:13 +02:00
|
|
|
template<typename _Size, typename _Tp>
|
|
|
|
inline typename
|
|
|
|
__gnu_cxx::__enable_if<__is_byte<_Tp>::__value, _Tp*>::__type
|
re PR libstdc++/35725 (ambiguous std::fill with character array)
2008-03-29 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/35725
* include/bits/stl_algobase.h (__fill_a(_ForwardIterator,
_ForwardIterator, _Tp), __fill_a(_Tp*, _Tp*, _Tp),
__fill_n_a(_OutputIterator, _Size, _Tp), __fill_n_a(_Tp*, _Size,
_Tp)): Fix signatures.
* testsuite/25_algorithms/fill/35725.cc: New.
* testsuite/25_algorithms/fill_n/35725.cc: Likewise.
From-SVN: r133721
2008-03-29 23:38:19 +01:00
|
|
|
__fill_n_a(_Tp* __first, _Size __n, const _Tp& __c)
|
PR libstdc++/30449 (fill, fill_n)
2007-01-21 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/30449 (fill, fill_n)
* include/bits/stl_algobase.h (__fill_aux(wchar_t*, wchar_t*,
const wchar_t&), __fill_n_aux(wchar_t*, _Size, const wchar_t&)): New.
(fill(signed char*, signed char*, const signed char&),
fill(unsigned char*, unsigned char*, const unsigned char&),
fill(char*, char*, char&), fill_n(signed char*, _Size,
const signed char&), fill_n(unsigned char*, _Size,
const unsigned char&), fill_n(char*, _Size, char&)): Rename to
__*_aux.
(__fill_normal, __fill_n_normal): New, call the latter.
(fill, fill_n): Adjust, call the latter.
* testsuite/25_algorithms/fill/4.cc: New.
* testsuite/25_algorithms/fill/5.cc: New.
From-SVN: r121027
2007-01-21 10:57:42 +01:00
|
|
|
{
|
2007-10-17 23:21:13 +02:00
|
|
|
std::__fill_a(__first, __first + __n, __c);
|
PR libstdc++/30449 (fill, fill_n)
2007-01-21 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/30449 (fill, fill_n)
* include/bits/stl_algobase.h (__fill_aux(wchar_t*, wchar_t*,
const wchar_t&), __fill_n_aux(wchar_t*, _Size, const wchar_t&)): New.
(fill(signed char*, signed char*, const signed char&),
fill(unsigned char*, unsigned char*, const unsigned char&),
fill(char*, char*, char&), fill_n(signed char*, _Size,
const signed char&), fill_n(unsigned char*, _Size,
const unsigned char&), fill_n(char*, _Size, char&)): Rename to
__*_aux.
(__fill_normal, __fill_n_normal): New, call the latter.
(fill, fill_n): Adjust, call the latter.
* testsuite/25_algorithms/fill/4.cc: New.
* testsuite/25_algorithms/fill/5.cc: New.
From-SVN: r121027
2007-01-21 10:57:42 +01:00
|
|
|
return __first + __n;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Fills the range [first,first+n) with copies of value.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @ingroup mutating_algorithms
|
PR libstdc++/30449 (fill, fill_n)
2007-01-21 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/30449 (fill, fill_n)
* include/bits/stl_algobase.h (__fill_aux(wchar_t*, wchar_t*,
const wchar_t&), __fill_n_aux(wchar_t*, _Size, const wchar_t&)): New.
(fill(signed char*, signed char*, const signed char&),
fill(unsigned char*, unsigned char*, const unsigned char&),
fill(char*, char*, char&), fill_n(signed char*, _Size,
const signed char&), fill_n(unsigned char*, _Size,
const unsigned char&), fill_n(char*, _Size, char&)): Rename to
__*_aux.
(__fill_normal, __fill_n_normal): New, call the latter.
(fill, fill_n): Adjust, call the latter.
* testsuite/25_algorithms/fill/4.cc: New.
* testsuite/25_algorithms/fill/5.cc: New.
From-SVN: r121027
2007-01-21 10:57:42 +01:00
|
|
|
* @param first An output iterator.
|
|
|
|
* @param n The count of copies to perform.
|
|
|
|
* @param value A reference-to-const of arbitrary type.
|
|
|
|
* @return The iterator at first+n.
|
|
|
|
*
|
|
|
|
* This function fills a range with copies of the same value. For char
|
|
|
|
* types filling contiguous areas of memory, this becomes an inline call
|
|
|
|
* to @c memset or @ wmemset.
|
2009-12-15 01:07:52 +01:00
|
|
|
*
|
|
|
|
* _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
|
|
* DR 865. More algorithms that throw away information
|
PR libstdc++/30449 (fill, fill_n)
2007-01-21 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/30449 (fill, fill_n)
* include/bits/stl_algobase.h (__fill_aux(wchar_t*, wchar_t*,
const wchar_t&), __fill_n_aux(wchar_t*, _Size, const wchar_t&)): New.
(fill(signed char*, signed char*, const signed char&),
fill(unsigned char*, unsigned char*, const unsigned char&),
fill(char*, char*, char&), fill_n(signed char*, _Size,
const signed char&), fill_n(unsigned char*, _Size,
const unsigned char&), fill_n(char*, _Size, char&)): Rename to
__*_aux.
(__fill_normal, __fill_n_normal): New, call the latter.
(fill, fill_n): Adjust, call the latter.
* testsuite/25_algorithms/fill/4.cc: New.
* testsuite/25_algorithms/fill/5.cc: New.
From-SVN: r121027
2007-01-21 10:57:42 +01:00
|
|
|
*/
|
PR libstdc++/30449 (equal)
2007-04-30 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/30449 (equal)
* include/bits/stl_algobase.h (struct __niter_base): Add.
(copy(_II, _II, _OI), copy_backward(_BI1, _BI1, _BI2),
fill(_ForwardIterator, _ForwardIterator, const _Tp&),
fill_n(_OI, _Size, const _Tp&), equal(_II1, _II1, _II2)):
Use it.
(struct __copy_normal, __copy_backward_normal,
struct __fill_normal, struct __fill_n_normal): Remove.
(struct __equal, struct __equal_aux): Add.
* include/bits/stl_iterator.h: Add _Iterator_type typedef.
* include/bits/stl_algobase.h (__fill_aux(wchar_t*,
wchar_t*, wchar_t), __fill_n_aux(wchar_t*, _Size, wchar_t)):
Remove.
* testsuite/23_containers/requirements/sequences/dr438/vector/
constructor_1_neg.cc: Adjust dg-error line number.
* testsuite/23_containers/requirements/sequences/dr438/vector/
constructor_2_neg.cc: Likewise.
From-SVN: r124295
2007-04-30 15:10:54 +02:00
|
|
|
template<typename _OI, typename _Size, typename _Tp>
|
|
|
|
inline _OI
|
|
|
|
fill_n(_OI __first, _Size __n, const _Tp& __value)
|
PR libstdc++/30449 (fill, fill_n)
2007-01-21 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/30449 (fill, fill_n)
* include/bits/stl_algobase.h (__fill_aux(wchar_t*, wchar_t*,
const wchar_t&), __fill_n_aux(wchar_t*, _Size, const wchar_t&)): New.
(fill(signed char*, signed char*, const signed char&),
fill(unsigned char*, unsigned char*, const unsigned char&),
fill(char*, char*, char&), fill_n(signed char*, _Size,
const signed char&), fill_n(unsigned char*, _Size,
const unsigned char&), fill_n(char*, _Size, char&)): Rename to
__*_aux.
(__fill_normal, __fill_n_normal): New, call the latter.
(fill, fill_n): Adjust, call the latter.
* testsuite/25_algorithms/fill/4.cc: New.
* testsuite/25_algorithms/fill/5.cc: New.
From-SVN: r121027
2007-01-21 10:57:42 +01:00
|
|
|
{
|
|
|
|
// concept requirements
|
PR libstdc++/30449 (equal)
2007-04-30 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/30449 (equal)
* include/bits/stl_algobase.h (struct __niter_base): Add.
(copy(_II, _II, _OI), copy_backward(_BI1, _BI1, _BI2),
fill(_ForwardIterator, _ForwardIterator, const _Tp&),
fill_n(_OI, _Size, const _Tp&), equal(_II1, _II1, _II2)):
Use it.
(struct __copy_normal, __copy_backward_normal,
struct __fill_normal, struct __fill_n_normal): Remove.
(struct __equal, struct __equal_aux): Add.
* include/bits/stl_iterator.h: Add _Iterator_type typedef.
* include/bits/stl_algobase.h (__fill_aux(wchar_t*,
wchar_t*, wchar_t), __fill_n_aux(wchar_t*, _Size, wchar_t)):
Remove.
* testsuite/23_containers/requirements/sequences/dr438/vector/
constructor_1_neg.cc: Adjust dg-error line number.
* testsuite/23_containers/requirements/sequences/dr438/vector/
constructor_2_neg.cc: Likewise.
From-SVN: r124295
2007-04-30 15:10:54 +02:00
|
|
|
__glibcxx_function_requires(_OutputIteratorConcept<_OI, _Tp>)
|
PR libstdc++/30449 (fill, fill_n)
2007-01-21 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/30449 (fill, fill_n)
* include/bits/stl_algobase.h (__fill_aux(wchar_t*, wchar_t*,
const wchar_t&), __fill_n_aux(wchar_t*, _Size, const wchar_t&)): New.
(fill(signed char*, signed char*, const signed char&),
fill(unsigned char*, unsigned char*, const unsigned char&),
fill(char*, char*, char&), fill_n(signed char*, _Size,
const signed char&), fill_n(unsigned char*, _Size,
const unsigned char&), fill_n(char*, _Size, char&)): Rename to
__*_aux.
(__fill_normal, __fill_n_normal): New, call the latter.
(fill, fill_n): Adjust, call the latter.
* testsuite/25_algorithms/fill/4.cc: New.
* testsuite/25_algorithms/fill/5.cc: New.
From-SVN: r121027
2007-01-21 10:57:42 +01:00
|
|
|
|
2010-02-05 11:55:54 +01:00
|
|
|
return _OI(std::__fill_n_a(std::__niter_base(__first), __n, __value));
|
PR libstdc++/30449 (fill, fill_n)
2007-01-21 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/30449 (fill, fill_n)
* include/bits/stl_algobase.h (__fill_aux(wchar_t*, wchar_t*,
const wchar_t&), __fill_n_aux(wchar_t*, _Size, const wchar_t&)): New.
(fill(signed char*, signed char*, const signed char&),
fill(unsigned char*, unsigned char*, const unsigned char&),
fill(char*, char*, char&), fill_n(signed char*, _Size,
const signed char&), fill_n(unsigned char*, _Size,
const unsigned char&), fill_n(char*, _Size, char&)): Rename to
__*_aux.
(__fill_normal, __fill_n_normal): New, call the latter.
(fill, fill_n): Adjust, call the latter.
* testsuite/25_algorithms/fill/4.cc: New.
* testsuite/25_algorithms/fill/5.cc: New.
From-SVN: r121027
2007-01-21 10:57:42 +01:00
|
|
|
}
|
2001-07-18 19:09:02 +02:00
|
|
|
|
PR libstdc++/30449 (equal)
2007-04-30 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/30449 (equal)
* include/bits/stl_algobase.h (struct __niter_base): Add.
(copy(_II, _II, _OI), copy_backward(_BI1, _BI1, _BI2),
fill(_ForwardIterator, _ForwardIterator, const _Tp&),
fill_n(_OI, _Size, const _Tp&), equal(_II1, _II1, _II2)):
Use it.
(struct __copy_normal, __copy_backward_normal,
struct __fill_normal, struct __fill_n_normal): Remove.
(struct __equal, struct __equal_aux): Add.
* include/bits/stl_iterator.h: Add _Iterator_type typedef.
* include/bits/stl_algobase.h (__fill_aux(wchar_t*,
wchar_t*, wchar_t), __fill_n_aux(wchar_t*, _Size, wchar_t)):
Remove.
* testsuite/23_containers/requirements/sequences/dr438/vector/
constructor_1_neg.cc: Adjust dg-error line number.
* testsuite/23_containers/requirements/sequences/dr438/vector/
constructor_2_neg.cc: Likewise.
From-SVN: r124295
2007-04-30 15:10:54 +02:00
|
|
|
template<bool _BoolType>
|
|
|
|
struct __equal
|
|
|
|
{
|
|
|
|
template<typename _II1, typename _II2>
|
|
|
|
static bool
|
|
|
|
equal(_II1 __first1, _II1 __last1, _II2 __first2)
|
|
|
|
{
|
|
|
|
for (; __first1 != __last1; ++__first1, ++__first2)
|
|
|
|
if (!(*__first1 == *__first2))
|
|
|
|
return false;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
template<>
|
|
|
|
struct __equal<true>
|
|
|
|
{
|
|
|
|
template<typename _Tp>
|
|
|
|
static bool
|
|
|
|
equal(const _Tp* __first1, const _Tp* __last1, const _Tp* __first2)
|
|
|
|
{
|
stl_algobase.h: Do not include <cstring>.
2007-05-07 Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_algobase.h: Do not include <cstring>.
(copy(const _Tp*, const _Tp*, _Tp*), __copy_b(const _Tp*, const _Tp*,
_Tp*)): Use __builtin_memmove.
(__fill_aux): Use __builtin_memset.
(equal(const _Tp*, const _Tp*, const _Tp*),
lexicographical_compare(const unsigned char*, const unsigned char*,
const unsigned char*, const unsigned char*)): Use __builtin_memcmp.
* include/bits/valarray_array.h: Do not include <cstring>.
(_Array_default_ctor<, true>::_S_do_it): Use __builtin_memset.
(_Array_copy_ctor<, true>::_S_do_it, _Array_copier<, true>::_S_do_it):
Use __builtin_memcpy.
* include/ext/algorithm
(__lexicographical_compare_3way(const unsigned char*,
const unsigned char*, const unsigned char*, const unsigned char*)):
Use __builtin_memcmp.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Adjust dg-error line number.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Likewise.
From-SVN: r124511
2007-05-07 22:36:40 +02:00
|
|
|
return !__builtin_memcmp(__first1, __first2, sizeof(_Tp)
|
|
|
|
* (__last1 - __first1));
|
PR libstdc++/30449 (equal)
2007-04-30 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/30449 (equal)
* include/bits/stl_algobase.h (struct __niter_base): Add.
(copy(_II, _II, _OI), copy_backward(_BI1, _BI1, _BI2),
fill(_ForwardIterator, _ForwardIterator, const _Tp&),
fill_n(_OI, _Size, const _Tp&), equal(_II1, _II1, _II2)):
Use it.
(struct __copy_normal, __copy_backward_normal,
struct __fill_normal, struct __fill_n_normal): Remove.
(struct __equal, struct __equal_aux): Add.
* include/bits/stl_iterator.h: Add _Iterator_type typedef.
* include/bits/stl_algobase.h (__fill_aux(wchar_t*,
wchar_t*, wchar_t), __fill_n_aux(wchar_t*, _Size, wchar_t)):
Remove.
* testsuite/23_containers/requirements/sequences/dr438/vector/
constructor_1_neg.cc: Adjust dg-error line number.
* testsuite/23_containers/requirements/sequences/dr438/vector/
constructor_2_neg.cc: Likewise.
From-SVN: r124295
2007-04-30 15:10:54 +02:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
template<typename _II1, typename _II2>
|
|
|
|
inline bool
|
|
|
|
__equal_aux(_II1 __first1, _II1 __last1, _II2 __first2)
|
|
|
|
{
|
|
|
|
typedef typename iterator_traits<_II1>::value_type _ValueType1;
|
|
|
|
typedef typename iterator_traits<_II2>::value_type _ValueType2;
|
|
|
|
const bool __simple = (__is_integer<_ValueType1>::__value
|
|
|
|
&& __is_pointer<_II1>::__value
|
|
|
|
&& __is_pointer<_II2>::__value
|
|
|
|
&& __are_same<_ValueType1, _ValueType2>::__value);
|
|
|
|
|
|
|
|
return std::__equal<__simple>::equal(__first1, __last1, __first2);
|
|
|
|
}
|
|
|
|
|
2007-09-12 00:32:51 +02:00
|
|
|
|
|
|
|
template<typename, typename>
|
|
|
|
struct __lc_rai
|
|
|
|
{
|
|
|
|
template<typename _II1, typename _II2>
|
|
|
|
static _II1
|
|
|
|
__newlast1(_II1, _II1 __last1, _II2, _II2)
|
|
|
|
{ return __last1; }
|
|
|
|
|
|
|
|
template<typename _II>
|
|
|
|
static bool
|
|
|
|
__cnd2(_II __first, _II __last)
|
|
|
|
{ return __first != __last; }
|
|
|
|
};
|
|
|
|
|
|
|
|
template<>
|
|
|
|
struct __lc_rai<random_access_iterator_tag, random_access_iterator_tag>
|
|
|
|
{
|
|
|
|
template<typename _RAI1, typename _RAI2>
|
|
|
|
static _RAI1
|
|
|
|
__newlast1(_RAI1 __first1, _RAI1 __last1,
|
|
|
|
_RAI2 __first2, _RAI2 __last2)
|
|
|
|
{
|
|
|
|
const typename iterator_traits<_RAI1>::difference_type
|
|
|
|
__diff1 = __last1 - __first1;
|
|
|
|
const typename iterator_traits<_RAI2>::difference_type
|
|
|
|
__diff2 = __last2 - __first2;
|
|
|
|
return __diff2 < __diff1 ? __first1 + __diff2 : __last1;
|
|
|
|
}
|
|
|
|
|
|
|
|
template<typename _RAI>
|
|
|
|
static bool
|
|
|
|
__cnd2(_RAI, _RAI)
|
|
|
|
{ return true; }
|
|
|
|
};
|
|
|
|
|
2007-11-17 01:32:29 +01:00
|
|
|
template<bool _BoolType>
|
|
|
|
struct __lexicographical_compare
|
|
|
|
{
|
|
|
|
template<typename _II1, typename _II2>
|
2007-11-25 12:22:03 +01:00
|
|
|
static bool __lc(_II1, _II1, _II2, _II2);
|
2007-11-17 01:32:29 +01:00
|
|
|
};
|
|
|
|
|
2007-11-25 12:22:03 +01:00
|
|
|
template<bool _BoolType>
|
|
|
|
template<typename _II1, typename _II2>
|
|
|
|
bool
|
|
|
|
__lexicographical_compare<_BoolType>::
|
|
|
|
__lc(_II1 __first1, _II1 __last1, _II2 __first2, _II2 __last2)
|
|
|
|
{
|
|
|
|
typedef typename iterator_traits<_II1>::iterator_category _Category1;
|
|
|
|
typedef typename iterator_traits<_II2>::iterator_category _Category2;
|
|
|
|
typedef std::__lc_rai<_Category1, _Category2> __rai_type;
|
|
|
|
|
|
|
|
__last1 = __rai_type::__newlast1(__first1, __last1,
|
|
|
|
__first2, __last2);
|
|
|
|
for (; __first1 != __last1 && __rai_type::__cnd2(__first2, __last2);
|
|
|
|
++__first1, ++__first2)
|
|
|
|
{
|
|
|
|
if (*__first1 < *__first2)
|
|
|
|
return true;
|
|
|
|
if (*__first2 < *__first1)
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
return __first1 == __last1 && __first2 != __last2;
|
|
|
|
}
|
|
|
|
|
2007-11-17 01:32:29 +01:00
|
|
|
template<>
|
|
|
|
struct __lexicographical_compare<true>
|
|
|
|
{
|
|
|
|
template<typename _Tp, typename _Up>
|
|
|
|
static bool
|
|
|
|
__lc(const _Tp* __first1, const _Tp* __last1,
|
|
|
|
const _Up* __first2, const _Up* __last2)
|
|
|
|
{
|
|
|
|
const size_t __len1 = __last1 - __first1;
|
|
|
|
const size_t __len2 = __last2 - __first2;
|
|
|
|
const int __result = __builtin_memcmp(__first1, __first2,
|
|
|
|
std::min(__len1, __len2));
|
|
|
|
return __result != 0 ? __result < 0 : __len1 < __len2;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
template<typename _II1, typename _II2>
|
|
|
|
inline bool
|
|
|
|
__lexicographical_compare_aux(_II1 __first1, _II1 __last1,
|
|
|
|
_II2 __first2, _II2 __last2)
|
|
|
|
{
|
|
|
|
typedef typename iterator_traits<_II1>::value_type _ValueType1;
|
|
|
|
typedef typename iterator_traits<_II2>::value_type _ValueType2;
|
|
|
|
const bool __simple =
|
|
|
|
(__is_byte<_ValueType1>::__value && __is_byte<_ValueType2>::__value
|
|
|
|
&& !__gnu_cxx::__numeric_traits<_ValueType1>::__is_signed
|
|
|
|
&& !__gnu_cxx::__numeric_traits<_ValueType2>::__is_signed
|
|
|
|
&& __is_pointer<_II1>::__value
|
|
|
|
&& __is_pointer<_II2>::__value);
|
|
|
|
|
|
|
|
return std::__lexicographical_compare<__simple>::__lc(__first1, __last1,
|
|
|
|
__first2, __last2);
|
|
|
|
}
|
|
|
|
|
2010-03-19 11:36:57 +01:00
|
|
|
/**
|
|
|
|
* @brief Finds the first position in which @a val could be inserted
|
|
|
|
* without changing the ordering.
|
|
|
|
* @param first An iterator.
|
|
|
|
* @param last Another iterator.
|
|
|
|
* @param val The search term.
|
|
|
|
* @return An iterator pointing to the first element <em>not less
|
|
|
|
* than</em> @a val, or end() if every element is less than
|
|
|
|
* @a val.
|
|
|
|
* @ingroup binary_search_algorithms
|
|
|
|
*/
|
|
|
|
template<typename _ForwardIterator, typename _Tp>
|
|
|
|
_ForwardIterator
|
|
|
|
lower_bound(_ForwardIterator __first, _ForwardIterator __last,
|
|
|
|
const _Tp& __val)
|
|
|
|
{
|
|
|
|
typedef typename iterator_traits<_ForwardIterator>::value_type
|
|
|
|
_ValueType;
|
|
|
|
typedef typename iterator_traits<_ForwardIterator>::difference_type
|
|
|
|
_DistanceType;
|
|
|
|
|
|
|
|
// concept requirements
|
|
|
|
__glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
|
|
|
|
__glibcxx_function_requires(_LessThanOpConcept<_ValueType, _Tp>)
|
|
|
|
__glibcxx_requires_partitioned_lower(__first, __last, __val);
|
|
|
|
|
|
|
|
_DistanceType __len = std::distance(__first, __last);
|
|
|
|
|
|
|
|
while (__len > 0)
|
|
|
|
{
|
2010-09-02 00:58:15 +02:00
|
|
|
_DistanceType __half = __len >> 1;
|
|
|
|
_ForwardIterator __middle = __first;
|
2010-03-19 11:36:57 +01:00
|
|
|
std::advance(__middle, __half);
|
|
|
|
if (*__middle < __val)
|
|
|
|
{
|
|
|
|
__first = __middle;
|
|
|
|
++__first;
|
|
|
|
__len = __len - __half - 1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
__len = __half;
|
|
|
|
}
|
|
|
|
return __first;
|
|
|
|
}
|
|
|
|
|
|
|
|
/// This is a helper function for the sort routines and for random.tcc.
|
|
|
|
// Precondition: __n > 0.
|
|
|
|
template<typename _Size>
|
|
|
|
inline _Size
|
|
|
|
__lg(_Size __n)
|
|
|
|
{
|
|
|
|
_Size __k;
|
|
|
|
for (__k = 0; __n != 0; __n >>= 1)
|
|
|
|
++__k;
|
|
|
|
return __k - 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
inline int
|
|
|
|
__lg(int __n)
|
|
|
|
{ return sizeof(int) * __CHAR_BIT__ - 1 - __builtin_clz(__n); }
|
|
|
|
|
|
|
|
inline long
|
|
|
|
__lg(long __n)
|
|
|
|
{ return sizeof(long) * __CHAR_BIT__ - 1 - __builtin_clzl(__n); }
|
|
|
|
|
|
|
|
inline long long
|
|
|
|
__lg(long long __n)
|
|
|
|
{ return sizeof(long long) * __CHAR_BIT__ - 1 - __builtin_clzll(__n); }
|
|
|
|
|
PR libstdc++/36104 part four
2011-01-30 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/36104 part four
* include/bits/c++config (_GLIBCXX_STD): Remove.
(_GLIBCXX_STD_D, _GLIBCXX_PR): Now _GLIBCXX_STD_C.
(_GLIBCXX_P): Now _GLIBCXX_STD_A.
(_GLIBCXX_NAMESPACE_DEBUG, _GLIBCXX_NAMESPACE_PARALLEL,
_GLIBCXX_NAMESPACE_PROFILE, _GLIBCXX_NAMESPACE_VERSION): Remove.
(_GLIBCXX_INLINE_DEBUG, _GLIBCXX_INLINE_PARALLEL,
_GLIBCXX_INLINE_PROFILE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE(X)): Remove.
(_GLIBCXX_END_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NESTED_NAMESPACE(X, Y)): Remove.
(_GLIBCXX_END_NESTED_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE_ALGO): Add.
(_GLIBCXX_END_NAMESPACE_ALGO): Add.
(_GLIBCXX_BEGIN_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_END_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_BEGIN_NAMESPACE_VERSION): Add.
(_GLIBCXX_END_NAMESPACE_VERSION): Add.
(_GLIBCXX_BEGIN_LDBL_NAMESPACE): To _GLIBCXX_BEGIN_NAMESPACE_LDBL.
(_GLIBCXX_END_LDBL_NAMESPACE): To _GLIBCXX_END_NAMESPACE_LDBL.
(_GLIBCXX_VISIBILITY_ATTR): Revert to _GLIBCXX_VISIBILITY.
* include/*: Use new macros for namespace scope.
* config/*: Same.
* src/*: Same.
* src/Makefile.am (sources): Remove debug_list.cc, add
compatibility-debug_list-2.cc.
(parallel_sources): Remove parallel_list.cc, add
compatibility-parallel_list-2.cc.
(compatibility-parallel_list-2.[o,lo]): New rule.
* src/Makefile.in: Regenerate.
* src/debug_list.cc: Remove.
* src/parallel_list.cc: Remove.
* src/compatibility-list-2.cc: New.
* src/compatibility-debug_list-2.cc: New.
* src/compatibility-parallel_list-2.cc: New.
* doc/doxygen/user.cfg.in: Adjust macros.
* testsuite/20_util/auto_ptr/assign_neg.cc: Adjust line numbers, macros.
* testsuite/20_util/declval/requirements/1_neg.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg1.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg2.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg3.cc: Same.
* testsuite/20_util/forward/c_neg.cc: Same.
* testsuite/20_util/forward/f_neg.cc: Same.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Same.
* testsuite/20_util/ratio/operations/ops_overflow_neg.cc: Same.
* testsuite/20_util/shared_ptr/cons/43820_neg.cc: Same.
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/forward_list/capacity/1.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
assign_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
insert_neg.cc: Same.
* testsuite/23_containers/list/capacity/29134.cc: Same.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/vector/bool/capacity/29134.cc: Same.
* testsuite/23_containers/vector/bool/modifiers/insert/31370.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: Same.
* testsuite/25_algorithms/sort/35588.cc: Same.
* testsuite/27_io/ios_base/cons/assign_neg.cc: Same.
* testsuite/27_io/ios_base/cons/copy_neg.cc: Same.
* testsuite/ext/profile/mutex_extensions_neg.cc: Same.
* testsuite/ext/profile/profiler_algos.cc: Same.
* testsuite/ext/type_traits/add_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/add_unsigned_integer_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_integer_neg.cc: Same.
* testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc: Same.
From-SVN: r169421
2011-01-30 23:39:36 +01:00
|
|
|
_GLIBCXX_END_NAMESPACE_VERSION
|
2007-09-12 00:32:51 +02:00
|
|
|
|
PR libstdc++/36104 part four
2011-01-30 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/36104 part four
* include/bits/c++config (_GLIBCXX_STD): Remove.
(_GLIBCXX_STD_D, _GLIBCXX_PR): Now _GLIBCXX_STD_C.
(_GLIBCXX_P): Now _GLIBCXX_STD_A.
(_GLIBCXX_NAMESPACE_DEBUG, _GLIBCXX_NAMESPACE_PARALLEL,
_GLIBCXX_NAMESPACE_PROFILE, _GLIBCXX_NAMESPACE_VERSION): Remove.
(_GLIBCXX_INLINE_DEBUG, _GLIBCXX_INLINE_PARALLEL,
_GLIBCXX_INLINE_PROFILE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE(X)): Remove.
(_GLIBCXX_END_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NESTED_NAMESPACE(X, Y)): Remove.
(_GLIBCXX_END_NESTED_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE_ALGO): Add.
(_GLIBCXX_END_NAMESPACE_ALGO): Add.
(_GLIBCXX_BEGIN_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_END_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_BEGIN_NAMESPACE_VERSION): Add.
(_GLIBCXX_END_NAMESPACE_VERSION): Add.
(_GLIBCXX_BEGIN_LDBL_NAMESPACE): To _GLIBCXX_BEGIN_NAMESPACE_LDBL.
(_GLIBCXX_END_LDBL_NAMESPACE): To _GLIBCXX_END_NAMESPACE_LDBL.
(_GLIBCXX_VISIBILITY_ATTR): Revert to _GLIBCXX_VISIBILITY.
* include/*: Use new macros for namespace scope.
* config/*: Same.
* src/*: Same.
* src/Makefile.am (sources): Remove debug_list.cc, add
compatibility-debug_list-2.cc.
(parallel_sources): Remove parallel_list.cc, add
compatibility-parallel_list-2.cc.
(compatibility-parallel_list-2.[o,lo]): New rule.
* src/Makefile.in: Regenerate.
* src/debug_list.cc: Remove.
* src/parallel_list.cc: Remove.
* src/compatibility-list-2.cc: New.
* src/compatibility-debug_list-2.cc: New.
* src/compatibility-parallel_list-2.cc: New.
* doc/doxygen/user.cfg.in: Adjust macros.
* testsuite/20_util/auto_ptr/assign_neg.cc: Adjust line numbers, macros.
* testsuite/20_util/declval/requirements/1_neg.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg1.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg2.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg3.cc: Same.
* testsuite/20_util/forward/c_neg.cc: Same.
* testsuite/20_util/forward/f_neg.cc: Same.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Same.
* testsuite/20_util/ratio/operations/ops_overflow_neg.cc: Same.
* testsuite/20_util/shared_ptr/cons/43820_neg.cc: Same.
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/forward_list/capacity/1.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
assign_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
insert_neg.cc: Same.
* testsuite/23_containers/list/capacity/29134.cc: Same.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/vector/bool/capacity/29134.cc: Same.
* testsuite/23_containers/vector/bool/modifiers/insert/31370.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: Same.
* testsuite/25_algorithms/sort/35588.cc: Same.
* testsuite/27_io/ios_base/cons/assign_neg.cc: Same.
* testsuite/27_io/ios_base/cons/copy_neg.cc: Same.
* testsuite/ext/profile/mutex_extensions_neg.cc: Same.
* testsuite/ext/profile/profiler_algos.cc: Same.
* testsuite/ext/type_traits/add_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/add_unsigned_integer_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_integer_neg.cc: Same.
* testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc: Same.
From-SVN: r169421
2011-01-30 23:39:36 +01:00
|
|
|
_GLIBCXX_BEGIN_NAMESPACE_ALGO
|
2007-09-12 00:32:51 +02:00
|
|
|
|
2001-11-20 01:51:37 +01:00
|
|
|
/**
|
|
|
|
* @brief Tests a range for element-wise equality.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @ingroup non_mutating_algorithms
|
2001-11-20 01:51:37 +01:00
|
|
|
* @param first1 An input iterator.
|
|
|
|
* @param last1 An input iterator.
|
|
|
|
* @param first2 An input iterator.
|
|
|
|
* @return A boolean true or false.
|
|
|
|
*
|
|
|
|
* This compares the elements of two ranges using @c == and returns true or
|
|
|
|
* false depending on whether all of the corresponding elements of the
|
|
|
|
* ranges are equal.
|
|
|
|
*/
|
PR libstdc++/30449 (equal)
2007-04-30 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/30449 (equal)
* include/bits/stl_algobase.h (struct __niter_base): Add.
(copy(_II, _II, _OI), copy_backward(_BI1, _BI1, _BI2),
fill(_ForwardIterator, _ForwardIterator, const _Tp&),
fill_n(_OI, _Size, const _Tp&), equal(_II1, _II1, _II2)):
Use it.
(struct __copy_normal, __copy_backward_normal,
struct __fill_normal, struct __fill_n_normal): Remove.
(struct __equal, struct __equal_aux): Add.
* include/bits/stl_iterator.h: Add _Iterator_type typedef.
* include/bits/stl_algobase.h (__fill_aux(wchar_t*,
wchar_t*, wchar_t), __fill_n_aux(wchar_t*, _Size, wchar_t)):
Remove.
* testsuite/23_containers/requirements/sequences/dr438/vector/
constructor_1_neg.cc: Adjust dg-error line number.
* testsuite/23_containers/requirements/sequences/dr438/vector/
constructor_2_neg.cc: Likewise.
From-SVN: r124295
2007-04-30 15:10:54 +02:00
|
|
|
template<typename _II1, typename _II2>
|
2001-07-18 19:09:02 +02:00
|
|
|
inline bool
|
PR libstdc++/30449 (equal)
2007-04-30 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/30449 (equal)
* include/bits/stl_algobase.h (struct __niter_base): Add.
(copy(_II, _II, _OI), copy_backward(_BI1, _BI1, _BI2),
fill(_ForwardIterator, _ForwardIterator, const _Tp&),
fill_n(_OI, _Size, const _Tp&), equal(_II1, _II1, _II2)):
Use it.
(struct __copy_normal, __copy_backward_normal,
struct __fill_normal, struct __fill_n_normal): Remove.
(struct __equal, struct __equal_aux): Add.
* include/bits/stl_iterator.h: Add _Iterator_type typedef.
* include/bits/stl_algobase.h (__fill_aux(wchar_t*,
wchar_t*, wchar_t), __fill_n_aux(wchar_t*, _Size, wchar_t)):
Remove.
* testsuite/23_containers/requirements/sequences/dr438/vector/
constructor_1_neg.cc: Adjust dg-error line number.
* testsuite/23_containers/requirements/sequences/dr438/vector/
constructor_2_neg.cc: Likewise.
From-SVN: r124295
2007-04-30 15:10:54 +02:00
|
|
|
equal(_II1 __first1, _II1 __last1, _II2 __first2)
|
2001-07-18 19:09:02 +02:00
|
|
|
{
|
|
|
|
// concept requirements
|
PR libstdc++/30449 (equal)
2007-04-30 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/30449 (equal)
* include/bits/stl_algobase.h (struct __niter_base): Add.
(copy(_II, _II, _OI), copy_backward(_BI1, _BI1, _BI2),
fill(_ForwardIterator, _ForwardIterator, const _Tp&),
fill_n(_OI, _Size, const _Tp&), equal(_II1, _II1, _II2)):
Use it.
(struct __copy_normal, __copy_backward_normal,
struct __fill_normal, struct __fill_n_normal): Remove.
(struct __equal, struct __equal_aux): Add.
* include/bits/stl_iterator.h: Add _Iterator_type typedef.
* include/bits/stl_algobase.h (__fill_aux(wchar_t*,
wchar_t*, wchar_t), __fill_n_aux(wchar_t*, _Size, wchar_t)):
Remove.
* testsuite/23_containers/requirements/sequences/dr438/vector/
constructor_1_neg.cc: Adjust dg-error line number.
* testsuite/23_containers/requirements/sequences/dr438/vector/
constructor_2_neg.cc: Likewise.
From-SVN: r124295
2007-04-30 15:10:54 +02:00
|
|
|
__glibcxx_function_requires(_InputIteratorConcept<_II1>)
|
|
|
|
__glibcxx_function_requires(_InputIteratorConcept<_II2>)
|
2003-07-05 06:05:45 +02:00
|
|
|
__glibcxx_function_requires(_EqualOpConcept<
|
PR libstdc++/30449 (equal)
2007-04-30 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/30449 (equal)
* include/bits/stl_algobase.h (struct __niter_base): Add.
(copy(_II, _II, _OI), copy_backward(_BI1, _BI1, _BI2),
fill(_ForwardIterator, _ForwardIterator, const _Tp&),
fill_n(_OI, _Size, const _Tp&), equal(_II1, _II1, _II2)):
Use it.
(struct __copy_normal, __copy_backward_normal,
struct __fill_normal, struct __fill_n_normal): Remove.
(struct __equal, struct __equal_aux): Add.
* include/bits/stl_iterator.h: Add _Iterator_type typedef.
* include/bits/stl_algobase.h (__fill_aux(wchar_t*,
wchar_t*, wchar_t), __fill_n_aux(wchar_t*, _Size, wchar_t)):
Remove.
* testsuite/23_containers/requirements/sequences/dr438/vector/
constructor_1_neg.cc: Adjust dg-error line number.
* testsuite/23_containers/requirements/sequences/dr438/vector/
constructor_2_neg.cc: Likewise.
From-SVN: r124295
2007-04-30 15:10:54 +02:00
|
|
|
typename iterator_traits<_II1>::value_type,
|
|
|
|
typename iterator_traits<_II2>::value_type>)
|
2003-11-11 21:09:16 +01:00
|
|
|
__glibcxx_requires_valid_range(__first1, __last1);
|
PR libstdc++/30449 (equal)
2007-04-30 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/30449 (equal)
* include/bits/stl_algobase.h (struct __niter_base): Add.
(copy(_II, _II, _OI), copy_backward(_BI1, _BI1, _BI2),
fill(_ForwardIterator, _ForwardIterator, const _Tp&),
fill_n(_OI, _Size, const _Tp&), equal(_II1, _II1, _II2)):
Use it.
(struct __copy_normal, __copy_backward_normal,
struct __fill_normal, struct __fill_n_normal): Remove.
(struct __equal, struct __equal_aux): Add.
* include/bits/stl_iterator.h: Add _Iterator_type typedef.
* include/bits/stl_algobase.h (__fill_aux(wchar_t*,
wchar_t*, wchar_t), __fill_n_aux(wchar_t*, _Size, wchar_t)):
Remove.
* testsuite/23_containers/requirements/sequences/dr438/vector/
constructor_1_neg.cc: Adjust dg-error line number.
* testsuite/23_containers/requirements/sequences/dr438/vector/
constructor_2_neg.cc: Likewise.
From-SVN: r124295
2007-04-30 15:10:54 +02:00
|
|
|
|
2010-02-05 11:55:54 +01:00
|
|
|
return std::__equal_aux(std::__niter_base(__first1),
|
|
|
|
std::__niter_base(__last1),
|
|
|
|
std::__niter_base(__first2));
|
2001-07-18 19:09:02 +02:00
|
|
|
}
|
|
|
|
|
2001-11-20 01:51:37 +01:00
|
|
|
/**
|
|
|
|
* @brief Tests a range for element-wise equality.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @ingroup non_mutating_algorithms
|
2001-11-20 01:51:37 +01:00
|
|
|
* @param first1 An input iterator.
|
|
|
|
* @param last1 An input iterator.
|
|
|
|
* @param first2 An input iterator.
|
2009-02-19 09:15:15 +01:00
|
|
|
* @param binary_pred A binary predicate @link functors
|
2007-09-12 00:32:51 +02:00
|
|
|
* functor@endlink.
|
|
|
|
* @return A boolean true or false.
|
2001-11-20 01:51:37 +01:00
|
|
|
*
|
|
|
|
* This compares the elements of two ranges using the binary_pred
|
|
|
|
* parameter, and returns true or
|
|
|
|
* false depending on whether all of the corresponding elements of the
|
|
|
|
* ranges are equal.
|
|
|
|
*/
|
2007-09-12 00:32:51 +02:00
|
|
|
template<typename _IIter1, typename _IIter2, typename _BinaryPredicate>
|
2001-07-18 19:09:02 +02:00
|
|
|
inline bool
|
2007-09-12 00:32:51 +02:00
|
|
|
equal(_IIter1 __first1, _IIter1 __last1,
|
|
|
|
_IIter2 __first2, _BinaryPredicate __binary_pred)
|
2001-07-18 19:09:02 +02:00
|
|
|
{
|
|
|
|
// concept requirements
|
2007-09-12 00:32:51 +02:00
|
|
|
__glibcxx_function_requires(_InputIteratorConcept<_IIter1>)
|
|
|
|
__glibcxx_function_requires(_InputIteratorConcept<_IIter2>)
|
2003-11-11 21:09:16 +01:00
|
|
|
__glibcxx_requires_valid_range(__first1, __last1);
|
2001-07-18 19:09:02 +02:00
|
|
|
|
2004-07-04 19:57:58 +02:00
|
|
|
for (; __first1 != __last1; ++__first1, ++__first2)
|
re PR libstdc++/31556 (find_if uses operator! instead of conversion to bool)
2007-04-13 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/31556
* include/bits/stl_algobase.h (equal(_InputIterator1, _InputIterator1,
_InputIterator2, _BinaryPredicate), mismatch(_InputIterator1,
_InputIterator1, _InputIterator2, _BinaryPredicate)): Convert
predicate return to bool.
* include/bits/stl_algo.h (__find_if(_InputIterator, _InputIterator,
_Predicate, input_iterator_tag), search(_ForwardIterator1,
_ForwardIterator1, _ForwardIterator2, _ForwardIterator2,
_BinaryPredicate), __search_n(_ForwardIterator, _ForwardIterator,
_Integer, const _Tp&, _BinaryPredicate, std::forward_iterator_tag),
__search_n(_RandomAccessIter, _RandomAccessIter, _Integer, const _Tp&,
_BinaryPredicate, std::random_access_iterator_tag),
search_n(_ForwardIterator, _ForwardIterator, _Integer, const _Tp&,
_BinaryPredicate), remove_copy_if(_InputIterator, _InputIterator,
_OutputIterator, _Predicate), __unique_copy(_ForwardIterator,
_ForwardIterator, _OutputIterator, _BinaryPredicate,
forward_iterator_tag, output_iterator_tag),
__unique_copy(_InputIterator, _InputIterator, _OutputIterator,
_BinaryPredicate, input_iterator_tag, output_iterator_tag),
__unique_copy(_InputIterator, _InputIterator, _OutputIterator,
_BinaryPredicate, input_iterator_tag, output_iterator_tag),
__unique_copy(_InputIterator, _InputIterator, _ForwardIterator,
_BinaryPredicate, input_iterator_tag, forward_iterator_tag),
unique(_ForwardIterator, _ForwardIterator, _BinaryPredicate),
__partition(_BidirectionalIterator, _BidirectionalIterator, _Predicate,
bidirectional_iterator_tag), binary_search(_ForwardIterator,
_ForwardIterator, const _Tp&, _Compare),
next_permutation(_BidirectionalIterator, _BidirectionalIterator,
_Compare), prev_permutation(_BidirectionalIterator,
_BidirectionalIterator, _Compare)): Likewise.
From-SVN: r123800
2007-04-14 00:22:56 +02:00
|
|
|
if (!bool(__binary_pred(*__first1, *__first2)))
|
2001-07-18 19:09:02 +02:00
|
|
|
return false;
|
2000-10-05 13:27:02 +02:00
|
|
|
return true;
|
2001-07-18 19:09:02 +02:00
|
|
|
}
|
|
|
|
|
2001-11-20 01:51:37 +01:00
|
|
|
/**
|
2010-02-04 19:20:34 +01:00
|
|
|
* @brief Performs @b dictionary comparison on ranges.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @ingroup sorting_algorithms
|
2001-11-20 01:51:37 +01:00
|
|
|
* @param first1 An input iterator.
|
|
|
|
* @param last1 An input iterator.
|
|
|
|
* @param first2 An input iterator.
|
|
|
|
* @param last2 An input iterator.
|
|
|
|
* @return A boolean true or false.
|
|
|
|
*
|
2010-02-04 19:20:34 +01:00
|
|
|
* <em>Returns true if the sequence of elements defined by the range
|
2001-11-20 01:51:37 +01:00
|
|
|
* [first1,last1) is lexicographically less than the sequence of elements
|
2010-02-04 19:20:34 +01:00
|
|
|
* defined by the range [first2,last2). Returns false otherwise.</em>
|
2001-11-20 01:51:37 +01:00
|
|
|
* (Quoted from [25.3.8]/1.) If the iterators are all character pointers,
|
|
|
|
* then this is an inline call to @c memcmp.
|
|
|
|
*/
|
2007-07-30 23:14:52 +02:00
|
|
|
template<typename _II1, typename _II2>
|
stl_algobase.h (struct __lexicographical_compare): Add.
2007-11-16 Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_algobase.h (struct __lexicographical_compare): Add.
(lexicographical_compare<>(_II1, _II1, _II2, _II2)): Use it.
(lexicographical_compare(const unsigned char*, const unsigned char*,
const unsigned char*, const unsigned char*),
lexicographical_compare(const char*, const char*, const char*,
const char*)): Remove.
* include/ext/numeric_traits.h (__numeric_traits_floating<>::
__is_signed): Add.
From-SVN: r130248
2007-11-17 00:41:55 +01:00
|
|
|
inline bool
|
|
|
|
lexicographical_compare(_II1 __first1, _II1 __last1,
|
2007-07-30 23:14:52 +02:00
|
|
|
_II2 __first2, _II2 __last2)
|
2001-07-18 19:09:02 +02:00
|
|
|
{
|
|
|
|
// concept requirements
|
2007-07-30 23:14:52 +02:00
|
|
|
typedef typename iterator_traits<_II1>::value_type _ValueType1;
|
|
|
|
typedef typename iterator_traits<_II2>::value_type _ValueType2;
|
|
|
|
__glibcxx_function_requires(_InputIteratorConcept<_II1>)
|
|
|
|
__glibcxx_function_requires(_InputIteratorConcept<_II2>)
|
|
|
|
__glibcxx_function_requires(_LessThanOpConcept<_ValueType1, _ValueType2>)
|
|
|
|
__glibcxx_function_requires(_LessThanOpConcept<_ValueType2, _ValueType1>)
|
2003-11-11 21:09:16 +01:00
|
|
|
__glibcxx_requires_valid_range(__first1, __last1);
|
|
|
|
__glibcxx_requires_valid_range(__first2, __last2);
|
2001-07-18 19:09:02 +02:00
|
|
|
|
2010-02-05 11:55:54 +01:00
|
|
|
return std::__lexicographical_compare_aux(std::__niter_base(__first1),
|
|
|
|
std::__niter_base(__last1),
|
|
|
|
std::__niter_base(__first2),
|
|
|
|
std::__niter_base(__last2));
|
stl_algobase.h (struct __lexicographical_compare): Add.
2007-11-16 Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_algobase.h (struct __lexicographical_compare): Add.
(lexicographical_compare<>(_II1, _II1, _II2, _II2)): Use it.
(lexicographical_compare(const unsigned char*, const unsigned char*,
const unsigned char*, const unsigned char*),
lexicographical_compare(const char*, const char*, const char*,
const char*)): Remove.
* include/ext/numeric_traits.h (__numeric_traits_floating<>::
__is_signed): Add.
From-SVN: r130248
2007-11-17 00:41:55 +01:00
|
|
|
}
|
2007-11-15 20:05:17 +01:00
|
|
|
|
2001-11-20 01:51:37 +01:00
|
|
|
/**
|
2010-02-04 19:20:34 +01:00
|
|
|
* @brief Performs @b dictionary comparison on ranges.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @ingroup sorting_algorithms
|
2001-11-20 01:51:37 +01:00
|
|
|
* @param first1 An input iterator.
|
|
|
|
* @param last1 An input iterator.
|
|
|
|
* @param first2 An input iterator.
|
|
|
|
* @param last2 An input iterator.
|
2009-02-19 09:15:15 +01:00
|
|
|
* @param comp A @link comparison_functors comparison functor@endlink.
|
2001-11-20 01:51:37 +01:00
|
|
|
* @return A boolean true or false.
|
|
|
|
*
|
2007-07-30 23:14:52 +02:00
|
|
|
* The same as the four-parameter @c lexicographical_compare, but uses the
|
2001-11-20 01:51:37 +01:00
|
|
|
* comp parameter instead of @c <.
|
|
|
|
*/
|
2007-07-30 23:14:52 +02:00
|
|
|
template<typename _II1, typename _II2, typename _Compare>
|
2001-07-18 19:09:02 +02:00
|
|
|
bool
|
2007-07-30 23:14:52 +02:00
|
|
|
lexicographical_compare(_II1 __first1, _II1 __last1,
|
|
|
|
_II2 __first2, _II2 __last2, _Compare __comp)
|
2001-07-18 19:09:02 +02:00
|
|
|
{
|
2007-07-30 23:14:52 +02:00
|
|
|
typedef typename iterator_traits<_II1>::iterator_category _Category1;
|
|
|
|
typedef typename iterator_traits<_II2>::iterator_category _Category2;
|
2007-11-15 20:05:17 +01:00
|
|
|
typedef std::__lc_rai<_Category1, _Category2> __rai_type;
|
2007-07-30 23:14:52 +02:00
|
|
|
|
2001-07-18 19:09:02 +02:00
|
|
|
// concept requirements
|
2007-07-30 23:14:52 +02:00
|
|
|
__glibcxx_function_requires(_InputIteratorConcept<_II1>)
|
|
|
|
__glibcxx_function_requires(_InputIteratorConcept<_II2>)
|
2003-11-11 21:09:16 +01:00
|
|
|
__glibcxx_requires_valid_range(__first1, __last1);
|
|
|
|
__glibcxx_requires_valid_range(__first2, __last2);
|
2001-07-18 19:09:02 +02:00
|
|
|
|
2007-09-12 00:32:51 +02:00
|
|
|
__last1 = __rai_type::__newlast1(__first1, __last1, __first2, __last2);
|
|
|
|
for (; __first1 != __last1 && __rai_type::__cnd2(__first2, __last2);
|
2004-07-04 19:57:58 +02:00
|
|
|
++__first1, ++__first2)
|
2003-06-06 02:19:17 +02:00
|
|
|
{
|
|
|
|
if (__comp(*__first1, *__first2))
|
|
|
|
return true;
|
|
|
|
if (__comp(*__first2, *__first1))
|
|
|
|
return false;
|
|
|
|
}
|
2001-07-18 19:09:02 +02:00
|
|
|
return __first1 == __last1 && __first2 != __last2;
|
|
|
|
}
|
|
|
|
|
2007-09-12 00:32:51 +02:00
|
|
|
/**
|
|
|
|
* @brief Finds the places in ranges which don't match.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @ingroup non_mutating_algorithms
|
2007-09-12 00:32:51 +02:00
|
|
|
* @param first1 An input iterator.
|
|
|
|
* @param last1 An input iterator.
|
|
|
|
* @param first2 An input iterator.
|
|
|
|
* @return A pair of iterators pointing to the first mismatch.
|
|
|
|
*
|
|
|
|
* This compares the elements of two ranges using @c == and returns a pair
|
|
|
|
* of iterators. The first iterator points into the first range, the
|
|
|
|
* second iterator points into the second range, and the elements pointed
|
|
|
|
* to by the iterators are not equal.
|
|
|
|
*/
|
|
|
|
template<typename _InputIterator1, typename _InputIterator2>
|
|
|
|
pair<_InputIterator1, _InputIterator2>
|
|
|
|
mismatch(_InputIterator1 __first1, _InputIterator1 __last1,
|
|
|
|
_InputIterator2 __first2)
|
|
|
|
{
|
|
|
|
// concept requirements
|
|
|
|
__glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
|
|
|
|
__glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
|
|
|
|
__glibcxx_function_requires(_EqualOpConcept<
|
|
|
|
typename iterator_traits<_InputIterator1>::value_type,
|
|
|
|
typename iterator_traits<_InputIterator2>::value_type>)
|
|
|
|
__glibcxx_requires_valid_range(__first1, __last1);
|
2001-07-18 19:09:02 +02:00
|
|
|
|
2007-09-12 00:32:51 +02:00
|
|
|
while (__first1 != __last1 && *__first1 == *__first2)
|
|
|
|
{
|
|
|
|
++__first1;
|
|
|
|
++__first2;
|
|
|
|
}
|
|
|
|
return pair<_InputIterator1, _InputIterator2>(__first1, __first2);
|
|
|
|
}
|
2003-11-11 21:09:16 +01:00
|
|
|
|
2007-09-12 00:32:51 +02:00
|
|
|
/**
|
|
|
|
* @brief Finds the places in ranges which don't match.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @ingroup non_mutating_algorithms
|
2007-09-12 00:32:51 +02:00
|
|
|
* @param first1 An input iterator.
|
|
|
|
* @param last1 An input iterator.
|
|
|
|
* @param first2 An input iterator.
|
2009-02-19 09:15:15 +01:00
|
|
|
* @param binary_pred A binary predicate @link functors
|
2007-09-12 00:32:51 +02:00
|
|
|
* functor@endlink.
|
|
|
|
* @return A pair of iterators pointing to the first mismatch.
|
|
|
|
*
|
|
|
|
* This compares the elements of two ranges using the binary_pred
|
|
|
|
* parameter, and returns a pair
|
|
|
|
* of iterators. The first iterator points into the first range, the
|
|
|
|
* second iterator points into the second range, and the elements pointed
|
|
|
|
* to by the iterators are not equal.
|
|
|
|
*/
|
|
|
|
template<typename _InputIterator1, typename _InputIterator2,
|
|
|
|
typename _BinaryPredicate>
|
|
|
|
pair<_InputIterator1, _InputIterator2>
|
|
|
|
mismatch(_InputIterator1 __first1, _InputIterator1 __last1,
|
|
|
|
_InputIterator2 __first2, _BinaryPredicate __binary_pred)
|
|
|
|
{
|
|
|
|
// concept requirements
|
|
|
|
__glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
|
|
|
|
__glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
|
|
|
|
__glibcxx_requires_valid_range(__first1, __last1);
|
2001-07-18 19:09:02 +02:00
|
|
|
|
2007-09-12 00:32:51 +02:00
|
|
|
while (__first1 != __last1 && bool(__binary_pred(*__first1, *__first2)))
|
|
|
|
{
|
|
|
|
++__first1;
|
|
|
|
++__first2;
|
|
|
|
}
|
|
|
|
return pair<_InputIterator1, _InputIterator2>(__first1, __first2);
|
|
|
|
}
|
|
|
|
|
PR libstdc++/36104 part four
2011-01-30 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/36104 part four
* include/bits/c++config (_GLIBCXX_STD): Remove.
(_GLIBCXX_STD_D, _GLIBCXX_PR): Now _GLIBCXX_STD_C.
(_GLIBCXX_P): Now _GLIBCXX_STD_A.
(_GLIBCXX_NAMESPACE_DEBUG, _GLIBCXX_NAMESPACE_PARALLEL,
_GLIBCXX_NAMESPACE_PROFILE, _GLIBCXX_NAMESPACE_VERSION): Remove.
(_GLIBCXX_INLINE_DEBUG, _GLIBCXX_INLINE_PARALLEL,
_GLIBCXX_INLINE_PROFILE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE(X)): Remove.
(_GLIBCXX_END_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NESTED_NAMESPACE(X, Y)): Remove.
(_GLIBCXX_END_NESTED_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE_ALGO): Add.
(_GLIBCXX_END_NAMESPACE_ALGO): Add.
(_GLIBCXX_BEGIN_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_END_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_BEGIN_NAMESPACE_VERSION): Add.
(_GLIBCXX_END_NAMESPACE_VERSION): Add.
(_GLIBCXX_BEGIN_LDBL_NAMESPACE): To _GLIBCXX_BEGIN_NAMESPACE_LDBL.
(_GLIBCXX_END_LDBL_NAMESPACE): To _GLIBCXX_END_NAMESPACE_LDBL.
(_GLIBCXX_VISIBILITY_ATTR): Revert to _GLIBCXX_VISIBILITY.
* include/*: Use new macros for namespace scope.
* config/*: Same.
* src/*: Same.
* src/Makefile.am (sources): Remove debug_list.cc, add
compatibility-debug_list-2.cc.
(parallel_sources): Remove parallel_list.cc, add
compatibility-parallel_list-2.cc.
(compatibility-parallel_list-2.[o,lo]): New rule.
* src/Makefile.in: Regenerate.
* src/debug_list.cc: Remove.
* src/parallel_list.cc: Remove.
* src/compatibility-list-2.cc: New.
* src/compatibility-debug_list-2.cc: New.
* src/compatibility-parallel_list-2.cc: New.
* doc/doxygen/user.cfg.in: Adjust macros.
* testsuite/20_util/auto_ptr/assign_neg.cc: Adjust line numbers, macros.
* testsuite/20_util/declval/requirements/1_neg.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg1.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg2.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg3.cc: Same.
* testsuite/20_util/forward/c_neg.cc: Same.
* testsuite/20_util/forward/f_neg.cc: Same.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Same.
* testsuite/20_util/ratio/operations/ops_overflow_neg.cc: Same.
* testsuite/20_util/shared_ptr/cons/43820_neg.cc: Same.
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/forward_list/capacity/1.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
assign_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
insert_neg.cc: Same.
* testsuite/23_containers/list/capacity/29134.cc: Same.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/vector/bool/capacity/29134.cc: Same.
* testsuite/23_containers/vector/bool/modifiers/insert/31370.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: Same.
* testsuite/25_algorithms/sort/35588.cc: Same.
* testsuite/27_io/ios_base/cons/assign_neg.cc: Same.
* testsuite/27_io/ios_base/cons/copy_neg.cc: Same.
* testsuite/ext/profile/mutex_extensions_neg.cc: Same.
* testsuite/ext/profile/profiler_algos.cc: Same.
* testsuite/ext/type_traits/add_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/add_unsigned_integer_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_integer_neg.cc: Same.
* testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc: Same.
From-SVN: r169421
2011-01-30 23:39:36 +01:00
|
|
|
_GLIBCXX_END_NAMESPACE_ALGO
|
|
|
|
} // namespace std
|
2007-09-12 00:32:51 +02:00
|
|
|
|
|
|
|
// NB: This file is included within many other C++ includes, as a way
|
|
|
|
// of getting the base algorithms. So, make sure that parallel bits
|
|
|
|
// come in too if requested.
|
|
|
|
#ifdef _GLIBCXX_PARALLEL
|
|
|
|
# include <parallel/algobase.h>
|
|
|
|
#endif
|
2000-10-05 13:27:02 +02:00
|
|
|
|
2004-02-08 05:46:42 +01:00
|
|
|
#endif
|