02d92e3b70
2001-07-17 Stephen M. Webb <stephen@bregmasoft.com>r All occurrences of the __value_type() and __distance_type() functions, which were required to support the HP STL, have been removed along with all the auxiliary forwarding functions that were required to support their use. The __iterator_category() function was pretty much left alone because there was no benefit to removing it and its use made code just a little more readable. Incidences of distance() with nonstandard argument list were replaced by calls to the standard function (only in the files affected by the removal of the other HP functions). The signature of the rotate() algorithm was changed to match the standard. Headers were reformatted under C++STYLE guidelines (indentation, linebreaks, typename keyword). * include/bits/stl_algo.h: replaced __value_type() and __distance_type() with iterator_traits, eliminated auxiliary support functions required to support said function usage. Changed nonstandard distance() call to standard call. * include/bits/stl_algobase.h: Same. * include/bits/stl_heap.h: Same. * include/bits/stl_numeric.h: Same. * include/bits/stl_uninitialized.h: Same. * include/bits/stl_iterator_base_types.h (__value_type()): Removed. (__distance_type()): Removed. (value_type()): Gone. (distance_type()): Done in. (iterator_category()): Hasta la vista, baby. * include/bits/stl_iterator_base_funcs.h (iterator_category()): Replaced with __iterator_category(). * include/backward/iterator.h: moved definition of value_type(), distance_type(), and iterator_category() out of std:: and into here. * testsuite/23_containers/vector_ctor.cc (test03): New testcases. * testsuite/23_containers/vector_modifiers.cc (test03): New testcases. * testsuite/25_algorithms/rotate.cc: New testcase. * testsuite/25_algorithms/copy.cc: New testcase. * testsuite/25_algorithms/sort.cc: Same. * testsuite/25_algorithms/heap.cc: Same. * testsuite/25_algorithms/partition.cc: Same. * testsuite/25_algorithms/binary_search.cc: Same. * testsuite/26_numerics/sum_diff.cc: Ditto. From-SVN: r44117
118 lines
3.2 KiB
C++
118 lines
3.2 KiB
C++
/*
|
|
*
|
|
* 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
|
|
* 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.
|
|
*/
|
|
|
|
#ifndef _CPP_BACKWARD_ITERATOR_H
|
|
#define _CPP_BACKWARD_ITERATOR_H 1
|
|
|
|
#include "backward_warning.h"
|
|
#include "function.h"
|
|
#include <stddef.h>
|
|
#include "iostream.h"
|
|
#include "iterator.h"
|
|
|
|
#include <bits/stl_construct.h>
|
|
#include <bits/stl_raw_storage_iter.h>
|
|
|
|
// Names from stl_iterator.h
|
|
using std::input_iterator_tag;
|
|
using std::output_iterator_tag;
|
|
using std::forward_iterator_tag;
|
|
using std::bidirectional_iterator_tag;
|
|
using std::random_access_iterator_tag;
|
|
|
|
#if 0
|
|
using std::iterator;
|
|
#endif
|
|
using std::input_iterator;
|
|
using std::output_iterator;
|
|
using std::forward_iterator;
|
|
using std::bidirectional_iterator;
|
|
using std::random_access_iterator;
|
|
|
|
using std::iterator_traits;
|
|
|
|
template <class _Iter>
|
|
inline typename iterator_traits<_Iter>::iterator_category
|
|
iterator_category(const _Iter& __i)
|
|
{ return __iterator_category(__i); }
|
|
|
|
template <class _Iter>
|
|
inline typename iterator_traits<_Iter>::difference_type*
|
|
distance_type(const _Iter&)
|
|
{ return static_cast<typename iterator_traits<_Iter>::difference_type*>(0); }
|
|
|
|
template<class _Iter>
|
|
inline typename iterator_traits<_Iter>::value_type*
|
|
value_type(const _Iter& __i)
|
|
{ return static_cast<typename iterator_traits<_Iter>::value_type*>(0); }
|
|
|
|
using std::distance;
|
|
using std::advance;
|
|
|
|
using std::insert_iterator;
|
|
using std::front_insert_iterator;
|
|
using std::back_insert_iterator;
|
|
using std::inserter;
|
|
using std::front_inserter;
|
|
using std::back_inserter;
|
|
|
|
using std::reverse_iterator;
|
|
using std::reverse_bidirectional_iterator;
|
|
|
|
using std::istream_iterator;
|
|
using std::ostream_iterator;
|
|
|
|
// Names from stl_construct.h
|
|
template<class _T1, class _T2>
|
|
inline void
|
|
construct(_T1* __p, const _T2& __value)
|
|
{ std::_Construct(__p, __value); }
|
|
|
|
template<class _T1>
|
|
inline void
|
|
construct(_T1* __p)
|
|
{ std::_Construct(__p); }
|
|
|
|
template <class _Tp>
|
|
inline void
|
|
destroy(_Tp* __pointer)
|
|
{ std::_Destroy(__pointer); }
|
|
|
|
template <class _ForwardIterator>
|
|
inline void
|
|
destroy(_ForwardIterator __first, _ForwardIterator __last)
|
|
{ std::_Destroy(__first, __last); }
|
|
}
|
|
|
|
// Names from stl_raw_storage_iter.h
|
|
using std::raw_storage_iterator;
|
|
|
|
#endif /* _CPP_BACKWARD_ITERATOR_H */
|
|
|
|
// Local Variables:
|
|
// mode:C++
|
|
// End:
|