Commit 3971a4d2 by Phil Edwards

deque.tcc, [...]: Re-indent contents of namespace std, re-wrap comment lines as necessary.

2002-08-09  Phil Edwards  <pme@gcc.gnu.org>

	* include/bits/deque.tcc, include/bits/list.tcc,
	include/bits/stl_deque.h, include/bits/stl_iterator_base_funcs.h,
	include/bits/stl_list.h, include/bits/stl_map.h,
	include/bits/stl_multimap.h, include/bits/stl_queue.h,
	include/bits/stl_stack.h, include/bits/stl_vector.h,
	include/bits/vector.tcc:  Re-indent contents of namespace std,
	re-wrap comment lines as necessary.

From-SVN: r56165
parent 2043c38e
2002-08-09 Phil Edwards <pme@gcc.gnu.org>
* include/bits/deque.tcc, include/bits/list.tcc,
include/bits/stl_deque.h, include/bits/stl_iterator_base_funcs.h,
include/bits/stl_list.h, include/bits/stl_map.h,
include/bits/stl_multimap.h, include/bits/stl_queue.h,
include/bits/stl_stack.h, include/bits/stl_vector.h,
include/bits/vector.tcc: Re-indent contents of namespace std,
re-wrap comment lines as necessary.
2002-08-08 Danny Smith <dannysmith@users.sourceforge.net> 2002-08-08 Danny Smith <dannysmith@users.sourceforge.net>
Benjamin Kosnik <bkoz@redhat.com> Benjamin Kosnik <bkoz@redhat.com>
......
...@@ -67,113 +67,105 @@ ...@@ -67,113 +67,105 @@
#pragma GCC system_header #pragma GCC system_header
#include <bits/concept_check.h> #include <bits/concept_check.h>
// Since this entire file is within namespace std, there's no reason to
// waste two spaces along the left column. Thus the leading indentation is
// slightly violated from here on.
namespace std namespace std
{ {
template<typename _InputIterator> template<typename _InputIterator>
inline typename iterator_traits<_InputIterator>::difference_type inline typename iterator_traits<_InputIterator>::difference_type
__distance(_InputIterator __first, _InputIterator __last, input_iterator_tag) __distance(_InputIterator __first, _InputIterator __last,
{ input_iterator_tag)
// concept requirements {
__glibcpp_function_requires(_InputIteratorConcept<_InputIterator>) // concept requirements
__glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
typename iterator_traits<_InputIterator>::difference_type __n = 0;
while (__first != __last) { typename iterator_traits<_InputIterator>::difference_type __n = 0;
++__first; ++__n; while (__first != __last) {
++__first; ++__n;
}
return __n;
} }
return __n;
} template<typename _RandomAccessIterator>
inline typename iterator_traits<_RandomAccessIterator>::difference_type
template<typename _RandomAccessIterator> __distance(_RandomAccessIterator __first, _RandomAccessIterator __last,
inline typename iterator_traits<_RandomAccessIterator>::difference_type random_access_iterator_tag)
__distance(_RandomAccessIterator __first, _RandomAccessIterator __last, {
random_access_iterator_tag) // concept requirements
{ __glibcpp_function_requires(_RandomAccessIteratorConcept<_RandomAccessIterator>)
// concept requirements return __last - __first;
__glibcpp_function_requires(_RandomAccessIteratorConcept<_RandomAccessIterator>) }
return __last - __first;
} /**
* @brief A generalization of pointer arithmetic.
/** * @param first An input iterator.
* @brief A generalization of pointer arithmetic. * @param last An input iterator.
* @param first An input iterator. * @return The distance between them.
* @param last An input iterator. *
* @return The distance between them. * Returns @c n such that first + n == last. This requires that @p last
* * must be reachable from @p first. Note that @c n may be negative.
* Returns @c n such that first + n == last. This requires that @p last *
* must be reachable from @p first. Note that @c n may be negative. * For random access iterators, this uses their @c + and @c - operations
* * and are constant time. For other %iterator classes they are linear time.
* For random access iterators, this uses their @c + and @c - operations */
* and are constant time. For other %iterator classes they are linear time. template<typename _InputIterator>
*/ inline typename iterator_traits<_InputIterator>::difference_type
template<typename _InputIterator> distance(_InputIterator __first, _InputIterator __last)
inline typename iterator_traits<_InputIterator>::difference_type {
distance(_InputIterator __first, _InputIterator __last) // concept requirements -- taken care of in __distance
{ return __distance(__first, __last, __iterator_category(__first));
// concept requirements -- taken care of in __distance }
return __distance(__first, __last, __iterator_category(__first));
} template<typename _InputIter, typename _Distance>
inline void
template<typename _InputIter, typename _Distance> __advance(_InputIter& __i, _Distance __n, input_iterator_tag)
inline void {
__advance(_InputIter& __i, _Distance __n, input_iterator_tag) // concept requirements
{ __glibcpp_function_requires(_InputIteratorConcept<_InputIter>)
// concept requirements
__glibcpp_function_requires(_InputIteratorConcept<_InputIter>)
while (__n--) ++__i;
}
template<typename _BidirectionalIterator, typename _Distance>
inline void
__advance(_BidirectionalIterator& __i, _Distance __n,
bidirectional_iterator_tag)
{
// concept requirements
__glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator>)
if (__n > 0)
while (__n--) ++__i; while (__n--) ++__i;
else }
while (__n++) --__i;
} template<typename _BidirectionalIterator, typename _Distance>
inline void
template<typename _RandomAccessIterator, typename _Distance> __advance(_BidirectionalIterator& __i, _Distance __n,
inline void bidirectional_iterator_tag)
__advance(_RandomAccessIterator& __i, _Distance __n, {
random_access_iterator_tag) // concept requirements
{ __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator>)
// concept requirements
__glibcpp_function_requires(_RandomAccessIteratorConcept<_RandomAccessIterator>) if (__n > 0)
__i += __n; while (__n--) ++__i;
} else
while (__n++) --__i;
/** }
* @brief A generalization of pointer arithmetic.
* @param i An input iterator. template<typename _RandomAccessIterator, typename _Distance>
* @param n The "delta" by which to change @p i. inline void
* @return Nothing. __advance(_RandomAccessIterator& __i, _Distance __n,
* random_access_iterator_tag)
* This increments @p i by @p n. For bidirectional and random access {
* iterators, @p n may be negative, in which case @p i is decremented. // concept requirements
* __glibcpp_function_requires(_RandomAccessIteratorConcept<_RandomAccessIterator>)
* For random access iterators, this uses their @c + and @c - operations __i += __n;
* and are constant time. For other %iterator classes they are linear time. }
*/
template<typename _InputIterator, typename _Distance> /**
inline void * @brief A generalization of pointer arithmetic.
advance(_InputIterator& __i, _Distance __n) * @param i An input iterator.
{ * @param n The "delta" by which to change @p i.
// concept requirements -- taken care of in __advance * @return Nothing.
__advance(__i, __n, __iterator_category(__i)); *
} * This increments @p i by @p n. For bidirectional and random access
* iterators, @p n may be negative, in which case @p i is decremented.
*
* For random access iterators, this uses their @c + and @c - operations
* and are constant time. For other %iterator classes they are linear time.
*/
template<typename _InputIterator, typename _Distance>
inline void
advance(_InputIterator& __i, _Distance __n)
{
// concept requirements -- taken care of in __advance
__advance(__i, __n, __iterator_category(__i));
}
} // namespace std } // namespace std
#endif /* __GLIBCPP_INTERNAL_ITERATOR_BASE_FUNCS_H */ #endif /* __GLIBCPP_INTERNAL_ITERATOR_BASE_FUNCS_H */
// Local Variables:
// mode:C++
// End:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment