summaryrefslogtreecommitdiffstats
path: root/libstdc++-v3/include/bits
diff options
context:
space:
mode:
Diffstat (limited to 'libstdc++-v3/include/bits')
-rw-r--r--libstdc++-v3/include/bits/basic_ios.h4
-rw-r--r--libstdc++-v3/include/bits/basic_string.h4
-rw-r--r--libstdc++-v3/include/bits/ios_base.h6
-rw-r--r--libstdc++-v3/include/bits/locale_classes.h2
-rw-r--r--libstdc++-v3/include/bits/postypes.h4
-rw-r--r--libstdc++-v3/include/bits/stl_algo.h245
-rw-r--r--libstdc++-v3/include/bits/stl_construct.h10
-rw-r--r--libstdc++-v3/include/bits/stl_deque.h39
-rw-r--r--libstdc++-v3/include/bits/stl_iterator.h4
-rw-r--r--libstdc++-v3/include/bits/stl_iterator_base_types.h4
-rw-r--r--libstdc++-v3/include/bits/stl_list.h28
-rw-r--r--libstdc++-v3/include/bits/stl_map.h8
-rw-r--r--libstdc++-v3/include/bits/stl_multimap.h8
-rw-r--r--libstdc++-v3/include/bits/stl_multiset.h8
-rw-r--r--libstdc++-v3/include/bits/stl_relops.h4
-rw-r--r--libstdc++-v3/include/bits/stl_set.h6
-rw-r--r--libstdc++-v3/include/bits/stl_tempbuf.h4
-rw-r--r--libstdc++-v3/include/bits/stl_vector.h12
18 files changed, 75 insertions, 325 deletions
diff --git a/libstdc++-v3/include/bits/basic_ios.h b/libstdc++-v3/include/bits/basic_ios.h
index ea9c0dc6565..ca59d5678f7 100644
--- a/libstdc++-v3/include/bits/basic_ios.h
+++ b/libstdc++-v3/include/bits/basic_ios.h
@@ -1,7 +1,7 @@
// Iostreams base classes -*- C++ -*-
// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-// 2006, 2007
+// 2006, 2007, 2008
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@@ -81,9 +81,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
//@{
/**
- * @if maint
* These are non-standard types.
- * @endif
*/
typedef ctype<_CharT> __ctype_type;
typedef num_put<_CharT, ostreambuf_iterator<_CharT, _Traits> >
diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h
index 1f36d1e9f44..d78e512ee34 100644
--- a/libstdc++-v3/include/bits/basic_string.h
+++ b/libstdc++-v3/include/bits/basic_string.h
@@ -1,7 +1,7 @@
// Components for manipulating sequences of characters -*- C++ -*-
// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-// 2006, 2007
+// 2006, 2007, 2008
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@@ -64,7 +64,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
* @doctodo
*
*
- * @if maint
* Documentation? What's that?
* Nathan Myers <ncm@cantrip.org>.
*
@@ -104,7 +103,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
*
* All but the last paragraph is considered pretty conventional
* for a C++ string implementation.
- * @endif
*/
// 21.3 Template class basic_string
template<typename _CharT, typename _Traits, typename _Alloc>
diff --git a/libstdc++-v3/include/bits/ios_base.h b/libstdc++-v3/include/bits/ios_base.h
index c7aa8fc7966..b8904e291ed 100644
--- a/libstdc++-v3/include/bits/ios_base.h
+++ b/libstdc++-v3/include/bits/ios_base.h
@@ -1,7 +1,7 @@
// Iostreams base classes -*- C++ -*-
// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-// 2006, 2007
+// 2006, 2007, 2008
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@@ -452,9 +452,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
protected:
//@{
/**
- * @if maint
* ios_base data members (doc me)
- * @endif
*/
streamsize _M_precision;
streamsize _M_width;
@@ -613,10 +611,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
* @brief Flags access.
* @return The precision to generate on certain output operations.
*
- * @if maint
* Be careful if you try to give a definition of "precision" here; see
* DR 189.
- * @endif
*/
streamsize
precision() const
diff --git a/libstdc++-v3/include/bits/locale_classes.h b/libstdc++-v3/include/bits/locale_classes.h
index 691694aad22..10ca19af97d 100644
--- a/libstdc++-v3/include/bits/locale_classes.h
+++ b/libstdc++-v3/include/bits/locale_classes.h
@@ -97,9 +97,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
* monetary, and messages. They form a bitmask that supports union and
* intersection. The category all is the union of these values.
*
- * @if maint
* NB: Order must match _S_facet_categories definition in locale.cc
- * @endif
*/
static const category none = 0;
static const category ctype = 1L << 0;
diff --git a/libstdc++-v3/include/bits/postypes.h b/libstdc++-v3/include/bits/postypes.h
index 8fc8cf986bb..1248881c8e6 100644
--- a/libstdc++-v3/include/bits/postypes.h
+++ b/libstdc++-v3/include/bits/postypes.h
@@ -1,7 +1,7 @@
// Position types -*- C++ -*-
// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-// 2006, 2007
+// 2006, 2007, 2008
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@@ -62,12 +62,10 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
/**
* @brief Type used by fpos, char_traits<char>, and char_traits<wchar_t>.
*
- * @if maint
* In clauses 21.1.3.1 and 27.4.1 streamoff is described as an
* implementation defined type.
* Note: In versions of GCC up to and including GCC 3.3, streamoff
* was typedef long.
- * @endif
*/
#ifdef _GLIBCXX_HAVE_INT64_T
typedef int64_t streamoff;
diff --git a/libstdc++-v3/include/bits/stl_algo.h b/libstdc++-v3/include/bits/stl_algo.h
index 4c65e1154c1..411505888f6 100644
--- a/libstdc++-v3/include/bits/stl_algo.h
+++ b/libstdc++-v3/include/bits/stl_algo.h
@@ -1,6 +1,6 @@
// Algorithm implementation -*- C++ -*-
-// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@@ -142,11 +142,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
// for_each
- /**
- * @if maint
- * This is an overload used by find() for the Input Iterator case.
- * @endif
- */
+ /// This is an overload used by find() for the Input Iterator case.
template<typename _InputIterator, typename _Tp>
inline _InputIterator
__find(_InputIterator __first, _InputIterator __last,
@@ -157,11 +153,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
return __first;
}
- /**
- * @if maint
- * This is an overload used by find_if() for the Input Iterator case.
- * @endif
- */
+ /// This is an overload used by find_if() for the Input Iterator case.
template<typename _InputIterator, typename _Predicate>
inline _InputIterator
__find_if(_InputIterator __first, _InputIterator __last,
@@ -172,11 +164,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
return __first;
}
- /**
- * @if maint
- * This is an overload used by find() for the RAI case.
- * @endif
- */
+ /// This is an overload used by find() for the RAI case.
template<typename _RandomAccessIterator, typename _Tp>
_RandomAccessIterator
__find(_RandomAccessIterator __first, _RandomAccessIterator __last,
@@ -224,11 +212,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
}
}
- /**
- * @if maint
- * This is an overload used by find_if() for the RAI case.
- * @endif
- */
+ /// This is an overload used by find_if() for the RAI case.
template<typename _RandomAccessIterator, typename _Predicate>
_RandomAccessIterator
__find_if(_RandomAccessIterator __first, _RandomAccessIterator __last,
@@ -290,11 +274,9 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
// search
/**
- * @if maint
* This is an uglified
* search_n(_ForwardIterator, _ForwardIterator, _Integer, const _Tp&)
* overloaded for forward iterators.
- * @endif
*/
template<typename _ForwardIterator, typename _Integer, typename _Tp>
_ForwardIterator
@@ -324,11 +306,9 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
}
/**
- * @if maint
* This is an uglified
* search_n(_ForwardIterator, _ForwardIterator, _Integer, const _Tp&)
* overloaded for random access iterators.
- * @endif
*/
template<typename _RandomAccessIter, typename _Integer, typename _Tp>
_RandomAccessIter
@@ -378,12 +358,10 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
// search_n
/**
- * @if maint
* This is an uglified
* search_n(_ForwardIterator, _ForwardIterator, _Integer, const _Tp&,
* _BinaryPredicate)
* overloaded for forward iterators.
- * @endif
*/
template<typename _ForwardIterator, typename _Integer, typename _Tp,
typename _BinaryPredicate>
@@ -419,12 +397,10 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
}
/**
- * @if maint
* This is an uglified
* search_n(_ForwardIterator, _ForwardIterator, _Integer, const _Tp&,
* _BinaryPredicate)
* overloaded for random access iterators.
- * @endif
*/
template<typename _RandomAccessIter, typename _Integer, typename _Tp,
typename _BinaryPredicate>
@@ -928,11 +904,9 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
}
/**
- * @if maint
* This is an uglified unique_copy(_InputIterator, _InputIterator,
* _OutputIterator)
* overloaded for forward iterators and output iterator as result.
- * @endif
*/
template<typename _ForwardIterator, typename _OutputIterator>
_OutputIterator
@@ -953,11 +927,9 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
}
/**
- * @if maint
* This is an uglified unique_copy(_InputIterator, _InputIterator,
* _OutputIterator)
* overloaded for input iterators and output iterator as result.
- * @endif
*/
template<typename _InputIterator, typename _OutputIterator>
_OutputIterator
@@ -978,11 +950,9 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
}
/**
- * @if maint
* This is an uglified unique_copy(_InputIterator, _InputIterator,
* _OutputIterator)
* overloaded for input iterators and forward iterator as result.
- * @endif
*/
template<typename _InputIterator, typename _ForwardIterator>
_ForwardIterator
@@ -999,12 +969,10 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
}
/**
- * @if maint
* This is an uglified
* unique_copy(_InputIterator, _InputIterator, _OutputIterator,
* _BinaryPredicate)
* overloaded for forward iterators and output iterator as result.
- * @endif
*/
template<typename _ForwardIterator, typename _OutputIterator,
typename _BinaryPredicate>
@@ -1030,12 +998,10 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
}
/**
- * @if maint
* This is an uglified
* unique_copy(_InputIterator, _InputIterator, _OutputIterator,
* _BinaryPredicate)
* overloaded for input iterators and output iterator as result.
- * @endif
*/
template<typename _InputIterator, typename _OutputIterator,
typename _BinaryPredicate>
@@ -1061,12 +1027,10 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
}
/**
- * @if maint
* This is an uglified
* unique_copy(_InputIterator, _InputIterator, _OutputIterator,
* _BinaryPredicate)
* overloaded for input iterators and forward iterator as result.
- * @endif
*/
template<typename _InputIterator, typename _ForwardIterator,
typename _BinaryPredicate>
@@ -1088,11 +1052,9 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
}
/**
- * @if maint
* This is an uglified reverse(_BidirectionalIterator,
* _BidirectionalIterator)
* overloaded for bidirectional iterators.
- * @endif
*/
template<typename _BidirectionalIterator>
void
@@ -1110,11 +1072,9 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
}
/**
- * @if maint
* This is an uglified reverse(_BidirectionalIterator,
* _BidirectionalIterator)
* overloaded for random access iterators.
- * @endif
*/
template<typename _RandomAccessIterator>
void
@@ -1191,10 +1151,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
}
/**
- * @if maint
* This is a helper function for the rotate algorithm specialized on RAIs.
* It returns the greatest common divisor of two integer values.
- * @endif
*/
template<typename _EuclideanRingElement>
_EuclideanRingElement
@@ -1209,11 +1167,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
return __m;
}
- /**
- * @if maint
- * This is a helper function for the rotate algorithm.
- * @endif
- */
+ /// This is a helper function for the rotate algorithm.
template<typename _ForwardIterator>
void
__rotate(_ForwardIterator __first,
@@ -1249,11 +1203,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
}
}
- /**
- * @if maint
- * This is a helper function for the rotate algorithm.
- * @endif
- */
+ /// This is a helper function for the rotate algorithm.
template<typename _BidirectionalIterator>
void
__rotate(_BidirectionalIterator __first,
@@ -1283,11 +1233,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
std::__reverse(__first, __middle, bidirectional_iterator_tag());
}
- /**
- * @if maint
- * This is a helper function for the rotate algorithm.
- * @endif
- */
+ /// This is a helper function for the rotate algorithm.
template<typename _RandomAccessIterator>
void
__rotate(_RandomAccessIterator __first,
@@ -1424,11 +1370,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
std::copy(__middle, __last, __result));
}
- /**
- * @if maint
- * This is a helper function...
- * @endif
- */
+ /// This is a helper function...
template<typename _ForwardIterator, typename _Predicate>
_ForwardIterator
__partition(_ForwardIterator __first, _ForwardIterator __last,
@@ -1453,11 +1395,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
return __first;
}
- /**
- * @if maint
- * This is a helper function...
- * @endif
- */
+ /// This is a helper function...
template<typename _BidirectionalIterator, typename _Predicate>
_BidirectionalIterator
__partition(_BidirectionalIterator __first, _BidirectionalIterator __last,
@@ -1487,11 +1425,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
// partition
- /**
- * @if maint
- * This is a helper function...
- * @endif
- */
+ /// This is a helper function...
template<typename _ForwardIterator, typename _Predicate, typename _Distance>
_ForwardIterator
__inplace_stable_partition(_ForwardIterator __first,
@@ -1515,11 +1449,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
return __begin;
}
- /**
- * @if maint
- * This is a helper function...
- * @endif
- */
+ /// This is a helper function...
template<typename _ForwardIterator, typename _Pointer, typename _Predicate,
typename _Distance>
_ForwardIterator
@@ -1617,11 +1547,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
}
}
- /**
- * @if maint
- * This is a helper function for the sort routines.
- * @endif
- */
+ /// This is a helper function for the sort routines.
template<typename _RandomAccessIterator>
void
__heap_select(_RandomAccessIterator __first,
@@ -1634,11 +1560,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
std::__pop_heap(__first, __middle, __i);
}
- /**
- * @if maint
- * This is a helper function for the sort routines.
- * @endif
- */
+ /// This is a helper function for the sort routines.
template<typename _RandomAccessIterator, typename _Compare>
void
__heap_select(_RandomAccessIterator __first,
@@ -1786,11 +1708,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
return __result_real_last;
}
- /**
- * @if maint
- * This is a helper function for the sort routine.
- * @endif
- */
+ /// This is a helper function for the sort routine.
template<typename _RandomAccessIterator, typename _Tp>
void
__unguarded_linear_insert(_RandomAccessIterator __last, _Tp __val)
@@ -1806,11 +1724,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
*__last = __val;
}
- /**
- * @if maint
- * This is a helper function for the sort routine.
- * @endif
- */
+ /// This is a helper function for the sort routine.
template<typename _RandomAccessIterator, typename _Tp, typename _Compare>
void
__unguarded_linear_insert(_RandomAccessIterator __last, _Tp __val,
@@ -1827,11 +1741,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
*__last = __val;
}
- /**
- * @if maint
- * This is a helper function for the sort routine.
- * @endif
- */
+ /// This is a helper function for the sort routine.
template<typename _RandomAccessIterator>
void
__insertion_sort(_RandomAccessIterator __first,
@@ -1854,11 +1764,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
}
}
- /**
- * @if maint
- * This is a helper function for the sort routine.
- * @endif
- */
+ /// This is a helper function for the sort routine.
template<typename _RandomAccessIterator, typename _Compare>
void
__insertion_sort(_RandomAccessIterator __first,
@@ -1880,11 +1786,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
}
}
- /**
- * @if maint
- * This is a helper function for the sort routine.
- * @endif
- */
+ /// This is a helper function for the sort routine.
template<typename _RandomAccessIterator>
inline void
__unguarded_insertion_sort(_RandomAccessIterator __first,
@@ -1897,11 +1799,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
std::__unguarded_linear_insert(__i, _ValueType(*__i));
}
- /**
- * @if maint
- * This is a helper function for the sort routine.
- * @endif
- */
+ /// This is a helper function for the sort routine.
template<typename _RandomAccessIterator, typename _Compare>
inline void
__unguarded_insertion_sort(_RandomAccessIterator __first,
@@ -1915,18 +1813,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
}
/**
- * @if maint
* @doctodo
* This controls some aspect of the sort routines.
- * @endif
*/
enum { _S_threshold = 16 };
- /**
- * @if maint
- * This is a helper function for the sort routine.
- * @endif
- */
+ /// This is a helper function for the sort routine.
template<typename _RandomAccessIterator>
void
__final_insertion_sort(_RandomAccessIterator __first,
@@ -1941,11 +1833,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
std::__insertion_sort(__first, __last);
}
- /**
- * @if maint
- * This is a helper function for the sort routine.
- * @endif
- */
+ /// This is a helper function for the sort routine.
template<typename _RandomAccessIterator, typename _Compare>
void
__final_insertion_sort(_RandomAccessIterator __first,
@@ -1961,11 +1849,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
std::__insertion_sort(__first, __last, __comp);
}
- /**
- * @if maint
- * This is a helper function...
- * @endif
- */
+ /// This is a helper function...
template<typename _RandomAccessIterator, typename _Tp>
_RandomAccessIterator
__unguarded_partition(_RandomAccessIterator __first,
@@ -1985,11 +1869,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
}
}
- /**
- * @if maint
- * This is a helper function...
- * @endif
- */
+ /// This is a helper function...
template<typename _RandomAccessIterator, typename _Tp, typename _Compare>
_RandomAccessIterator
__unguarded_partition(_RandomAccessIterator __first,
@@ -2010,11 +1890,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
}
}
- /**
- * @if maint
- * This is a helper function for the sort routine.
- * @endif
- */
+ /// This is a helper function for the sort routine.
template<typename _RandomAccessIterator, typename _Size>
void
__introsort_loop(_RandomAccessIterator __first,
@@ -2046,11 +1922,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
}
}
- /**
- * @if maint
- * This is a helper function for the sort routine.
- * @endif
- */
+ /// This is a helper function for the sort routine.
template<typename _RandomAccessIterator, typename _Size, typename _Compare>
void
__introsort_loop(_RandomAccessIterator __first,
@@ -2083,11 +1955,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
}
}
- /**
- * @if maint
- * This is a helper function for the sort routines. Precondition: __n > 0.
- * @endif
- */
+ /// This is a helper function for the sort routines. Precondition: __n > 0.
template<typename _Size>
inline _Size
__lg(_Size __n)
@@ -2125,6 +1993,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
if (__depth_limit == 0)
{
std::__heap_select(__first, __nth + 1, __last);
+
// Place the nth largest element in its final position.
std::iter_swap(__first, __nth);
return;
@@ -2578,11 +2447,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
// merge
- /**
- * @if maint
- * This is a helper function for the merge routines.
- * @endif
- */
+ /// This is a helper function for the merge routines.
template<typename _BidirectionalIterator1, typename _BidirectionalIterator2,
typename _BidirectionalIterator3>
_BidirectionalIterator3
@@ -2617,11 +2482,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
}
}
- /**
- * @if maint
- * This is a helper function for the merge routines.
- * @endif
- */
+ /// This is a helper function for the merge routines.
template<typename _BidirectionalIterator1, typename _BidirectionalIterator2,
typename _BidirectionalIterator3, typename _Compare>
_BidirectionalIterator3
@@ -2657,11 +2518,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
}
}
- /**
- * @if maint
- * This is a helper function for the merge routines.
- * @endif
- */
+ /// This is a helper function for the merge routines.
template<typename _BidirectionalIterator1, typename _BidirectionalIterator2,
typename _Distance>
_BidirectionalIterator1
@@ -2693,11 +2550,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
}
}
- /**
- * @if maint
- * This is a helper function for the merge routines.
- * @endif
- */
+ /// This is a helper function for the merge routines.
template<typename _BidirectionalIterator, typename _Distance,
typename _Pointer>
void
@@ -2753,11 +2606,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
}
}
- /**
- * @if maint
- * This is a helper function for the merge routines.
- * @endif
- */
+ /// This is a helper function for the merge routines.
template<typename _BidirectionalIterator, typename _Distance,
typename _Pointer, typename _Compare>
void
@@ -2815,11 +2664,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
}
}
- /**
- * @if maint
- * This is a helper function for the merge routines.
- * @endif
- */
+ /// This is a helper function for the merge routines.
template<typename _BidirectionalIterator, typename _Distance>
void
__merge_without_buffer(_BidirectionalIterator __first,
@@ -2862,11 +2707,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
__len1 - __len11, __len2 - __len22);
}
- /**
- * @if maint
- * This is a helper function for the merge routines.
- * @endif
- */
+ /// This is a helper function for the merge routines.
template<typename _BidirectionalIterator, typename _Distance,
typename _Compare>
void
@@ -3207,11 +3048,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
__comp);
}
- /**
- * @if maint
- * This is a helper function for the stable sorting routines.
- * @endif
- */
+ /// This is a helper function for the stable sorting routines.
template<typename _RandomAccessIterator>
void
__inplace_stable_sort(_RandomAccessIterator __first,
@@ -3230,11 +3067,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
__last - __middle);
}
- /**
- * @if maint
- * This is a helper function for the stable sorting routines.
- * @endif
- */
+ /// This is a helper function for the stable sorting routines.
template<typename _RandomAccessIterator, typename _Compare>
void
__inplace_stable_sort(_RandomAccessIterator __first,
@@ -4615,14 +4448,12 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P)
* unique_copy() is stable, so the relative order of elements that are
* copied is unchanged.
*
- * @if maint
* _GLIBCXX_RESOLVE_LIB_DEFECTS
* DR 241. Does unique_copy() require CopyConstructible and Assignable?
*
* _GLIBCXX_RESOLVE_LIB_DEFECTS
* DR 538. 241 again: Does unique_copy() require CopyConstructible and
* Assignable?
- * @endif
*/
template<typename _InputIterator, typename _OutputIterator>
inline _OutputIterator
@@ -4659,10 +4490,8 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P)
* unique_copy() is stable, so the relative order of elements that are
* copied is unchanged.
*
- * @if maint
* _GLIBCXX_RESOLVE_LIB_DEFECTS
* DR 241. Does unique_copy() require CopyConstructible and Assignable?
- * @endif
*/
template<typename _InputIterator, typename _OutputIterator,
typename _BinaryPredicate>
diff --git a/libstdc++-v3/include/bits/stl_construct.h b/libstdc++-v3/include/bits/stl_construct.h
index 460383424a6..1c4324eb0e1 100644
--- a/libstdc++-v3/include/bits/stl_construct.h
+++ b/libstdc++-v3/include/bits/stl_construct.h
@@ -1,6 +1,6 @@
// nonstandard construct and destroy functions -*- C++ -*-
-// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@@ -67,10 +67,8 @@
_GLIBCXX_BEGIN_NAMESPACE(std)
/**
- * @if maint
* Constructs an object in existing memory by invoking an allocated
* object's constructor with an initializer.
- * @endif
*/
template<typename _T1, typename _T2>
inline void
@@ -82,9 +80,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
}
/**
- * @if maint
* Destroy the object pointed to by a pointer type.
- * @endif
*/
template<typename _Tp>
inline void
@@ -92,11 +88,9 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
{ __pointer->~_Tp(); }
/**
- * @if maint
* Destroy a range of objects. If the value_type of the object has
* a trivial destructor, the compiler should optimize all of this
* away, otherwise the objects' destructors must be invoked.
- * @endif
*/
template<typename _ForwardIterator>
inline void
@@ -110,11 +104,9 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
}
/**
- * @if maint
* Destroy a range of objects using the supplied allocator. For
* nondefault allocators we do not optimize away invocation of
* destroy() even if _Tp has a trivial destructor.
- * @endif
*/
template <typename _Tp> class allocator;
diff --git a/libstdc++-v3/include/bits/stl_deque.h b/libstdc++-v3/include/bits/stl_deque.h
index 4261e758299..c5ae17a83f8 100644
--- a/libstdc++-v3/include/bits/stl_deque.h
+++ b/libstdc++-v3/include/bits/stl_deque.h
@@ -1,6 +1,6 @@
// Deque implementation -*- C++ -*-
-// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@@ -69,7 +69,6 @@
_GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
/**
- * @if maint
* @brief This function controls the size of memory nodes.
* @param size The size of an element.
* @return The number (not byte size) of elements per node.
@@ -78,7 +77,6 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
* be a useful wrapper around a repeated constant expression. The '512' is
* tuneable (and no other code needs to change), but no investigation has
* been done since inheriting the SGI code.
- * @endif
*/
inline size_t
__deque_buf_size(size_t __size)
@@ -94,9 +92,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
* elements is done as offsets of either of those two, relying on
* operator overloading in this class.
*
- * @if maint
* All the functions are op overloads except for _M_set_node.
- * @endif
*/
template<typename _Tp, typename _Ref, typename _Ptr>
struct _Deque_iterator
@@ -221,11 +217,10 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
operator[](difference_type __n) const
{ return *(*this + __n); }
- /** @if maint
+ /**
* Prepares to traverse new_node. Sets everything except
* _M_cur, which should therefore be set by the caller
* immediately afterwards, based on _M_first and _M_last.
- * @endif
*/
void
_M_set_node(_Map_pointer __new_node)
@@ -357,7 +352,6 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
const _Deque_iterator<_Tp, _Tp&, _Tp*>& __last, const _Tp& __value);
/**
- * @if maint
* Deque base class. This class provides the unified face for %deque's
* allocation. This class's constructor and destructor allocate and
* deallocate (but do not initialize) storage. This makes %exception
@@ -366,7 +360,6 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
* Nothing in this class ever constructs or destroys an actual Tp element.
* (Deque handles that itself.) Only/All memory management is performed
* here.
- * @endif
*/
template<typename _Tp, typename _Alloc>
class _Deque_base
@@ -491,14 +484,12 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
}
/**
- * @if maint
* @brief Layout storage.
* @param num_elements The count of T's for which to allocate space
* at first.
* @return Nothing.
*
* The initial underlying memory layout is a bit complicated...
- * @endif
*/
template<typename _Tp, typename _Alloc>
void
@@ -583,7 +574,6 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
* out to violate the C++ standard (it can be detected using template
* template parameters), and it was removed.
*
- * @if maint
* Here's how a deque<Tp> manages memory. Each deque has 4 members:
*
* - Tp** _M_map
@@ -648,7 +638,6 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
* All the implementation routines for deque itself work only through the
* start and finish iterators. This keeps the routines simple and sane,
* and we can use other standard algorithms as well.
- * @endif
*/
template<typename _Tp, typename _Alloc = std::allocator<_Tp> >
class deque : protected _Deque_base<_Tp, _Alloc>
@@ -691,10 +680,9 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
using _Base::_M_deallocate_map;
using _Base::_M_get_Tp_allocator;
- /** @if maint
+ /**
* A total of four data members accumulated down the heirarchy.
* May be accessed via _M_impl.*
- * @endif
*/
using _Base::_M_impl;
@@ -1034,7 +1022,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
{ return this->_M_impl._M_start[difference_type(__n)]; }
protected:
- /// @if maint Safety check used only from at(). @endif
+ /// Safety check used only from at().
void
_M_range_check(size_type __n) const
{
@@ -1414,7 +1402,6 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
// called by the second initialize_dispatch above
//@{
/**
- * @if maint
* @brief Fills the deque with whatever is in [first,last).
* @param first An input iterator.
* @param last An input iterator.
@@ -1423,7 +1410,6 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
* If the iterators are actually forward iterators (or better), then the
* memory layout can be done all at once. Else we move forward using
* push_back on each value from the iterator.
- * @endif
*/
template<typename _InputIterator>
void
@@ -1438,7 +1424,6 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
//@}
/**
- * @if maint
* @brief Fills the %deque with copies of value.
* @param value Initial value.
* @return Nothing.
@@ -1447,7 +1432,6 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
*
* This function is called only when the user provides an explicit size
* (with or without an explicit exemplar value).
- * @endif
*/
void
_M_fill_initialize(const value_type& __value);
@@ -1517,11 +1501,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
}
//@{
- /**
- * @if maint
- * @brief Helper functions for push_* and pop_*.
- * @endif
- */
+ /// Helper functions for push_* and pop_*.
#ifndef __GXX_EXPERIMENTAL_CXX0X__
void _M_push_back_aux(const value_type&);
@@ -1645,12 +1625,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
}
//@{
- /**
- * @if maint
- * @brief Memory-handling helpers for the previous internal insert
- * functions.
- * @endif
- */
+ /// Memory-handling helpers for the previous internal insert functions.
iterator
_M_reserve_elements_at_front(size_type __n)
{
@@ -1681,13 +1656,11 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
//@{
/**
- * @if maint
* @brief Memory-handling helpers for the major %map.
*
* Makes sure the _M_map has space for new nodes. Does not
* actually add the nodes. Can invalidate _M_map pointers.
* (And consequently, %deque iterators.)
- * @endif
*/
void
_M_reserve_map_at_back(size_type __nodes_to_add = 1)
diff --git a/libstdc++-v3/include/bits/stl_iterator.h b/libstdc++-v3/include/bits/stl_iterator.h
index 2d89e576f4e..aac03137543 100644
--- a/libstdc++-v3/include/bits/stl_iterator.h
+++ b/libstdc++-v3/include/bits/stl_iterator.h
@@ -1,6 +1,6 @@
// Iterators -*- C++ -*-
-// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@@ -860,14 +860,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
// 24.4.3 Move iterators
/**
- * @if maint
* Class template move_iterator is an iterator adapter with the same
* behavior as the underlying iterator except that its dereference
* operator implicitly converts the value returned by the underlying
* iterator's dereference operator to an rvalue reference. Some
* generic algorithms can be called with move iterators to replace
* copying with moving.
- * @endif
*/
template<typename _Iterator>
class move_iterator
diff --git a/libstdc++-v3/include/bits/stl_iterator_base_types.h b/libstdc++-v3/include/bits/stl_iterator_base_types.h
index 785abefdd34..8810f522d54 100644
--- a/libstdc++-v3/include/bits/stl_iterator_base_types.h
+++ b/libstdc++-v3/include/bits/stl_iterator_base_types.h
@@ -1,6 +1,6 @@
// Types used in iterator implementation -*- C++ -*-
-// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@@ -158,10 +158,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
};
/**
- * @if maint
* This function is not a part of the C++ standard but is syntactic
* sugar for internal library use only.
- * @endif
*/
template<typename _Iter>
inline typename iterator_traits<_Iter>::iterator_category
diff --git a/libstdc++-v3/include/bits/stl_list.h b/libstdc++-v3/include/bits/stl_list.h
index 0904586a9e6..79439e785e9 100644
--- a/libstdc++-v3/include/bits/stl_list.h
+++ b/libstdc++-v3/include/bits/stl_list.h
@@ -1,6 +1,6 @@
// List implementation -*- C++ -*-
-// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@@ -71,11 +71,11 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
// duplication. This results in some "needless" static_cast'ing later on,
// but it's all safe downcasting.
- /// @if maint Common part of a node in the %list. @endif
+ /// Common part of a node in the %list.
struct _List_node_base
{
- _List_node_base* _M_next; ///< Self-explanatory
- _List_node_base* _M_prev; ///< Self-explanatory
+ _List_node_base* _M_next;
+ _List_node_base* _M_prev;
static void
swap(_List_node_base& __x, _List_node_base& __y);
@@ -94,19 +94,18 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
unhook();
};
- /// @if maint An actual node in the %list. @endif
+ /// An actual node in the %list.
template<typename _Tp>
struct _List_node : public _List_node_base
{
- _Tp _M_data; ///< User's data.
+ ///< User's data.
+ _Tp _M_data;
};
/**
* @brief A list::iterator.
*
- * @if maint
* All the functions are op overloads.
- * @endif
*/
template<typename _Tp>
struct _List_iterator
@@ -181,9 +180,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
/**
* @brief A list::const_iterator.
*
- * @if maint
* All the functions are op overloads.
- * @endif
*/
template<typename _Tp>
struct _List_const_iterator
@@ -273,11 +270,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
{ return __x._M_node != __y._M_node; }
- /**
- * @if maint
- * See bits/stl_deque.h's _Deque_base for an explanation.
- * @endif
- */
+ /// See bits/stl_deque.h's _Deque_base for an explanation.
template<typename _Tp, typename _Alloc>
class _List_base
{
@@ -400,7 +393,6 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
* specialized algorithms %unique to linked lists, such as
* splicing, sorting, and in-place reversal.
*
- * @if maint
* A couple points on memory allocation for list<Tp>:
*
* First, we never actually allocate a Tp, we allocate
@@ -418,7 +410,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
* pointing to @e D, not to @e A! To get to the head of the %list,
* we start at the tail and move forward by one. When this member
* iterator's next/previous pointers refer to itself, the %list is
- * %empty. @endif
+ * %empty.
*/
template<typename _Tp, typename _Alloc = std::allocator<_Tp> >
class list : protected _List_base<_Tp, _Alloc>
@@ -457,11 +449,9 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
using _Base::_M_get_Node_allocator;
/**
- * @if maint
* @param x An instance of user data.
*
* Allocates space for a new node and constructs a copy of @a x in it.
- * @endif
*/
#ifndef __GXX_EXPERIMENTAL_CXX0X__
_Node*
diff --git a/libstdc++-v3/include/bits/stl_map.h b/libstdc++-v3/include/bits/stl_map.h
index 64264405cb1..bf174cc0634 100644
--- a/libstdc++-v3/include/bits/stl_map.h
+++ b/libstdc++-v3/include/bits/stl_map.h
@@ -1,6 +1,6 @@
// Map implementation -*- C++ -*-
-// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@@ -82,11 +82,9 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
*
* Maps support bidirectional iterators.
*
- * @if maint
* The private tree data is declared exactly the same way for map and
* multimap; the distinction is made entirely in how the tree functions are
* called (*_unique versus *_equal, same as the standard).
- * @endif
*/
template <typename _Key, typename _Tp, typename _Compare = std::less<_Key>,
typename _Alloc = std::allocator<std::pair<const _Key, _Tp> > >
@@ -124,14 +122,14 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
};
private:
- /// @if maint This turns a red-black tree into a [multi]map. @endif
+ /// This turns a red-black tree into a [multi]map.
typedef typename _Alloc::template rebind<value_type>::other
_Pair_alloc_type;
typedef _Rb_tree<key_type, value_type, _Select1st<value_type>,
key_compare, _Pair_alloc_type> _Rep_type;
- /// @if maint The actual tree structure. @endif
+ /// The actual tree structure.
_Rep_type _M_t;
public:
diff --git a/libstdc++-v3/include/bits/stl_multimap.h b/libstdc++-v3/include/bits/stl_multimap.h
index 76d6b4797f2..b264126576e 100644
--- a/libstdc++-v3/include/bits/stl_multimap.h
+++ b/libstdc++-v3/include/bits/stl_multimap.h
@@ -1,6 +1,6 @@
// Multimap implementation -*- C++ -*-
-// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@@ -81,11 +81,9 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
*
* Multimaps support bidirectional iterators.
*
- * @if maint
* The private tree data is declared exactly the same way for map and
* multimap; the distinction is made entirely in how the tree functions are
* called (*_unique versus *_equal, same as the standard).
- * @endif
*/
template <typename _Key, typename _Tp,
typename _Compare = std::less<_Key>,
@@ -124,13 +122,13 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
};
private:
- /// @if maint This turns a red-black tree into a [multi]map. @endif
+ /// This turns a red-black tree into a [multi]map.
typedef typename _Alloc::template rebind<value_type>::other
_Pair_alloc_type;
typedef _Rb_tree<key_type, value_type, _Select1st<value_type>,
key_compare, _Pair_alloc_type> _Rep_type;
- /// @if maint The actual tree structure. @endif
+ /// The actual tree structure.
_Rep_type _M_t;
public:
diff --git a/libstdc++-v3/include/bits/stl_multiset.h b/libstdc++-v3/include/bits/stl_multiset.h
index 5c897bdcc34..0a8e38174c7 100644
--- a/libstdc++-v3/include/bits/stl_multiset.h
+++ b/libstdc++-v3/include/bits/stl_multiset.h
@@ -1,6 +1,6 @@
// Multiset implementation -*- C++ -*-
-// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@@ -80,11 +80,9 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
*
* Multisets support bidirectional iterators.
*
- * @if maint
* The private tree data is declared exactly the same way for set and
* multiset; the distinction is made entirely in how the tree functions are
* called (*_unique versus *_equal, same as the standard).
- * @endif
*/
template <typename _Key, typename _Compare = std::less<_Key>,
typename _Alloc = std::allocator<_Key> >
@@ -106,12 +104,12 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
typedef _Alloc allocator_type;
private:
- /// @if maint This turns a red-black tree into a [multi]set. @endif
+ /// This turns a red-black tree into a [multi]set.
typedef typename _Alloc::template rebind<_Key>::other _Key_alloc_type;
typedef _Rb_tree<key_type, value_type, _Identity<value_type>,
key_compare, _Key_alloc_type> _Rep_type;
- /// @if maint The actual tree structure. @endif
+ /// The actual tree structure.
_Rep_type _M_t;
public:
diff --git a/libstdc++-v3/include/bits/stl_relops.h b/libstdc++-v3/include/bits/stl_relops.h
index 11fc30dedd8..376a6b17369 100644
--- a/libstdc++-v3/include/bits/stl_relops.h
+++ b/libstdc++-v3/include/bits/stl_relops.h
@@ -1,6 +1,6 @@
// std::rel_ops implementation -*- C++ -*-
-// Copyright (C) 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2002, 2004, 2005, 2008 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -57,7 +57,6 @@
* This is an internal header file, included by other library headers.
* You should not attempt to use it directly.
*
- * @if maint
* Inclusion of this file has been removed from
* all of the other STL headers for safety reasons, except std_utility.h.
* For more information, see the thread of about twenty messages starting
@@ -65,7 +64,6 @@
* FAQ at http://gcc.gnu.org/onlinedocs/libstdc++/faq/index.html#4_4 .
*
* Short summary: the rel_ops operators should be avoided for the present.
- * @endif
*/
#ifndef _STL_RELOPS_H
diff --git a/libstdc++-v3/include/bits/stl_set.h b/libstdc++-v3/include/bits/stl_set.h
index 3eb4b26962a..ab84e88aec8 100644
--- a/libstdc++-v3/include/bits/stl_set.h
+++ b/libstdc++-v3/include/bits/stl_set.h
@@ -1,6 +1,6 @@
// Set implementation -*- C++ -*-
-// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@@ -83,11 +83,9 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
* @param Compare Comparison function object type, defaults to less<Key>.
* @param Alloc Allocator type, defaults to allocator<Key>.
*
- * @if maint
* The private tree data is declared exactly the same way for set and
* multiset; the distinction is made entirely in how the tree functions are
* called (*_unique versus *_equal, same as the standard).
- * @endif
*/
template<typename _Key, typename _Compare = std::less<_Key>,
typename _Alloc = std::allocator<_Key> >
@@ -116,7 +114,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
typedef _Rb_tree<key_type, value_type, _Identity<value_type>,
key_compare, _Key_alloc_type> _Rep_type;
- _Rep_type _M_t; // red-black tree representing set
+ _Rep_type _M_t; // Red-black tree representing set.
public:
//@{
diff --git a/libstdc++-v3/include/bits/stl_tempbuf.h b/libstdc++-v3/include/bits/stl_tempbuf.h
index 3a22fab0615..e9ba10c7e8a 100644
--- a/libstdc++-v3/include/bits/stl_tempbuf.h
+++ b/libstdc++-v3/include/bits/stl_tempbuf.h
@@ -1,6 +1,6 @@
// Temporary buffer implementation -*- C++ -*-
-// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@@ -119,11 +119,9 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
/**
- * @if maint
* This class is used in two places: stl_algo.h and ext/memory,
* where it is wrapped as the temporary_buffer class. See
* temporary_buffer docs for more notes.
- * @endif
*/
template<typename _ForwardIterator, typename _Tp>
class _Temporary_buffer
diff --git a/libstdc++-v3/include/bits/stl_vector.h b/libstdc++-v3/include/bits/stl_vector.h
index ad7d08375ac..ea75ede2431 100644
--- a/libstdc++-v3/include/bits/stl_vector.h
+++ b/libstdc++-v3/include/bits/stl_vector.h
@@ -1,6 +1,6 @@
// Vector implementation -*- C++ -*-
-// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@@ -68,11 +68,7 @@
_GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
- /**
- * @if maint
- * See bits/stl_deque.h's _Deque_base for an explanation.
- * @endif
- */
+ /// See bits/stl_deque.h's _Deque_base for an explanation.
template<typename _Tp, typename _Alloc>
struct _Vector_base
{
@@ -582,7 +578,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
{ return *(this->_M_impl._M_start + __n); }
protected:
- /// @if maint Safety check used only from at(). @endif
+ /// Safety check used only from at().
void
_M_range_check(size_type __n) const
{
@@ -897,10 +893,8 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
protected:
/**
- * @if maint
* Memory expansion handler. Uses the member allocation function to
* obtain @a n bytes of memory, and then copies [first,last) into it.
- * @endif
*/
template<typename _ForwardIterator>
pointer
OpenPOWER on IntegriCloud