Commit 93c66bc6 by Benjamin Kosnik Committed by Benjamin Kosnik

user.cfg.in (PDF_HYPERLINKS): To NO.

2011-08-06  Benjamin Kosnik  <bkoz@redhat.com>

	* doc/doxygen/user.cfg.in (PDF_HYPERLINKS): To NO.

2011-08-06  Benjamin Kosnik  <bkoz@redhat.com>

	* doc/doxygen/user.cfg.in: Add scoped_allocator.

	* include/debug/safe_sequence.h: Fix doxygen markup.
	* include/debug/safe_unordered_base.h: Same.
	* include/debug/safe_local_iterator.tcc: Same.
	* include/debug/safe_unordered_container.h: Same.
	* include/std/valarray: Same.
	* include/std/iomanip: Same.
	* include/std/streambuf: Same.
	* include/std/bitset: Same.
	* include/std/fstream: Same.
	* include/std/functional: Same.
	* include/std/istream: Same.
	* include/std/ostream: Same.
	* include/std/scoped_allocator: Same.
	* include/std/sstream: Same.
	* include/parallel/multiway_merge.h: Same.
	* include/parallel/base.h: Same.
	* include/parallel/for_each_selectors.h: Same.
	* include/parallel/multiway_mergesort.h: Same.
	* include/parallel/search.h: Same.
	* include/parallel/partial_sum.h: Same.
	* include/parallel/queue.h: Same.
	* include/parallel/sort.h: Same.
	* include/parallel/random_number.h: Same.
	* include/ext/vstring.h: Same.
	* include/ext/algorithm: Same.
	* include/ext/pb_ds/assoc_container.h: Same.
	* include/ext/bitmap_allocator.h: Same.
	* include/ext/stdio_filebuf.h: Same.
	* include/ext/memory: Same.
	* include/ext/functional: Same.
	* include/bits/basic_ios.h: Same.
	* include/bits/stl_list.h: Same.
	* include/bits/stl_map.h: Same.
	* include/bits/stl_algobase.h: Same.
	* include/bits/stl_queue.h: Same.
	* include/bits/gslice.h: Same.
	* include/bits/locale_classes.h: Same.
	* include/bits/stl_set.h: Same.
	* include/bits/locale_facets.h: Same.
	* include/bits/stl_stack.h: Same.
	* include/bits/stl_heap.h: Same.
	* include/bits/forward_list.h: Same.
	* include/bits/stream_iterator.h: Same.
	* include/bits/basic_string.h: Same.
	* include/bits/stl_multimap.h: Same.
	* include/bits/stl_pair.h: Same.
	* include/bits/ios_base.h: Same.
	* include/bits/stl_numeric.h: Same.
	* include/bits/stl_vector.h: Same.
	* include/bits/stl_deque.h: Same.
	* include/bits/codecvt.h: Same.
	* include/bits/stl_multiset.h: Same.
	* include/bits/stl_uninitialized.h: Same.
	* include/bits/ptr_traits.h: Same.
	* include/bits/slice_array.h: Same.
	* include/bits/stl_iterator_base_funcs.h: Same.
	* include/bits/stl_algo.h: Same.
	* include/bits/stl_iterator.h: Same.
	* include/bits/stl_tempbuf.h: Same.
	* include/bits/regex.h: Same.
	* include/bits/range_access.h: Same.
	* include/bits/random.h: Same.
	* include/bits/alloc_traits.h: Same.
	* include/bits/regex_error.h: Same.
	* include/bits/locale_facets_nonio.h: Same.
	* include/bits/stl_relops.h: Same.
	* include/backward/auto_ptr.h: Same.
	* libsupc++/initializer_list: Same.

	* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
	Adjust line numbers.
	* testsuite/23_containers/list/requirements/dr438/insert_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.

From-SVN: r177542
parent 77d2c8b3
2011-08-06 Benjamin Kosnik <bkoz@redhat.com>
* doc/doxygen/user.cfg.in (PDF_HYPERLINKS): To NO.
2011-08-06 Benjamin Kosnik <bkoz@redhat.com>
* doc/doxygen/user.cfg.in: Add scoped_allocator.
* include/debug/safe_sequence.h: Fix doxygen markup.
* include/debug/safe_unordered_base.h: Same.
* include/debug/safe_local_iterator.tcc: Same.
* include/debug/safe_unordered_container.h: Same.
* include/std/valarray: Same.
* include/std/iomanip: Same.
* include/std/streambuf: Same.
* include/std/bitset: Same.
* include/std/fstream: Same.
* include/std/functional: Same.
* include/std/istream: Same.
* include/std/ostream: Same.
* include/std/scoped_allocator: Same.
* include/std/sstream: Same.
* include/parallel/multiway_merge.h: Same.
* include/parallel/base.h: Same.
* include/parallel/for_each_selectors.h: Same.
* include/parallel/multiway_mergesort.h: Same.
* include/parallel/search.h: Same.
* include/parallel/partial_sum.h: Same.
* include/parallel/queue.h: Same.
* include/parallel/sort.h: Same.
* include/parallel/random_number.h: Same.
* include/ext/vstring.h: Same.
* include/ext/algorithm: Same.
* include/ext/pb_ds/assoc_container.h: Same.
* include/ext/bitmap_allocator.h: Same.
* include/ext/stdio_filebuf.h: Same.
* include/ext/memory: Same.
* include/ext/functional: Same.
* include/bits/basic_ios.h: Same.
* include/bits/stl_list.h: Same.
* include/bits/stl_map.h: Same.
* include/bits/stl_algobase.h: Same.
* include/bits/stl_queue.h: Same.
* include/bits/gslice.h: Same.
* include/bits/locale_classes.h: Same.
* include/bits/stl_set.h: Same.
* include/bits/locale_facets.h: Same.
* include/bits/stl_stack.h: Same.
* include/bits/stl_heap.h: Same.
* include/bits/forward_list.h: Same.
* include/bits/stream_iterator.h: Same.
* include/bits/basic_string.h: Same.
* include/bits/stl_multimap.h: Same.
* include/bits/stl_pair.h: Same.
* include/bits/ios_base.h: Same.
* include/bits/stl_numeric.h: Same.
* include/bits/stl_vector.h: Same.
* include/bits/stl_deque.h: Same.
* include/bits/codecvt.h: Same.
* include/bits/stl_multiset.h: Same.
* include/bits/stl_uninitialized.h: Same.
* include/bits/ptr_traits.h: Same.
* include/bits/slice_array.h: Same.
* include/bits/stl_iterator_base_funcs.h: Same.
* include/bits/stl_algo.h: Same.
* include/bits/stl_iterator.h: Same.
* include/bits/stl_tempbuf.h: Same.
* include/bits/regex.h: Same.
* include/bits/range_access.h: Same.
* include/bits/random.h: Same.
* include/bits/alloc_traits.h: Same.
* include/bits/regex_error.h: Same.
* include/bits/locale_facets_nonio.h: Same.
* include/bits/stl_relops.h: Same.
* include/backward/auto_ptr.h: Same.
* libsupc++/initializer_list: Same.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Adjust line numbers.
* testsuite/23_containers/list/requirements/dr438/insert_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.
2011-08-05 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* acinclude.m4 (GLIBCXX_EXPORT_INCLUDES): Point TOPLEVEL_INCLUDES
......
......@@ -648,6 +648,7 @@ INPUT = @srcdir@/doc/doxygen/doxygroups.cc \
include/random \
include/ratio \
include/regex \
include/scoped_allocator \
include/set \
include/sstream \
include/stack \
......@@ -1384,7 +1385,7 @@ LATEX_FOOTER =
# contain links (just like the HTML output) instead of page references
# This makes the output suitable for online browsing using a pdf viewer.
PDF_HYPERLINKS = YES
PDF_HYPERLINKS = NO
# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
# plain latex in the generated Makefile. Set this option to YES to get a
......
......@@ -95,30 +95,30 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief An %auto_ptr is usually constructed from a raw pointer.
* @param p A pointer (defaults to NULL).
* @param __p A pointer (defaults to NULL).
*
* This object now @e owns the object pointed to by @a p.
* This object now @e owns the object pointed to by @a __p.
*/
explicit
auto_ptr(element_type* __p = 0) throw() : _M_ptr(__p) { }
/**
* @brief An %auto_ptr can be constructed from another %auto_ptr.
* @param a Another %auto_ptr of the same type.
* @param __a Another %auto_ptr of the same type.
*
* This object now @e owns the object previously owned by @a a,
* This object now @e owns the object previously owned by @a __a,
* which has given up ownership.
*/
auto_ptr(auto_ptr& __a) throw() : _M_ptr(__a.release()) { }
/**
* @brief An %auto_ptr can be constructed from another %auto_ptr.
* @param a Another %auto_ptr of a different but related type.
* @param __a Another %auto_ptr of a different but related type.
*
* A pointer-to-Tp1 must be convertible to a
* pointer-to-Tp/element_type.
*
* This object now @e owns the object previously owned by @a a,
* This object now @e owns the object previously owned by @a __a,
* which has given up ownership.
*/
template<typename _Tp1>
......@@ -126,9 +126,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief %auto_ptr assignment operator.
* @param a Another %auto_ptr of the same type.
* @param __a Another %auto_ptr of the same type.
*
* This object now @e owns the object previously owned by @a a,
* This object now @e owns the object previously owned by @a __a,
* which has given up ownership. The object that this one @e
* used to own and track has been deleted.
*/
......@@ -141,11 +141,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief %auto_ptr assignment operator.
* @param a Another %auto_ptr of a different but related type.
* @param __a Another %auto_ptr of a different but related type.
*
* A pointer-to-Tp1 must be convertible to a pointer-to-Tp/element_type.
*
* This object now @e owns the object previously owned by @a a,
* This object now @e owns the object previously owned by @a __a,
* which has given up ownership. The object that this one @e
* used to own and track has been deleted.
*/
......@@ -231,9 +231,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Forcibly deletes the managed object.
* @param p A pointer (defaults to NULL).
* @param __p A pointer (defaults to NULL).
*
* This object now @e owns the object pointed to by @a p. The
* This object now @e owns the object pointed to by @a __p. The
* previous object has been deleted.
*/
void
......
......@@ -22,6 +22,11 @@
// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
// <http://www.gnu.org/licenses/>.
/** @file bits/alloc_traits.h
* This is an internal header file, included by other library headers.
* Do not attempt to use it directly. @headername{scoped_allocator}
*/
#ifndef _ALLOC_TRAITS_H
#define _ALLOC_TRAITS_H 1
......@@ -346,8 +351,8 @@ _GLIBCXX_ALLOC_TR_NESTED_TYPE(propagate_on_container_swap,
/**
* @brief Allocate memory.
* @param a An allocator.
* @param n The number of objects to allocate space for.
* @param __a An allocator.
* @param __n The number of objects to allocate space for.
*
* Calls @c a.allocate(n)
*/
......@@ -357,9 +362,9 @@ _GLIBCXX_ALLOC_TR_NESTED_TYPE(propagate_on_container_swap,
/**
* @brief Allocate memory.
* @param a An allocator.
* @param n The number of objects to allocate space for.
* @param hint Aid to locality.
* @param __a An allocator.
* @param __n The number of objects to allocate space for.
* @param __hint Aid to locality.
* @return Memory of suitable size and alignment for @a n objects
* of type @c value_type
*
......@@ -372,9 +377,9 @@ _GLIBCXX_ALLOC_TR_NESTED_TYPE(propagate_on_container_swap,
/**
* @brief Deallocate memory.
* @param a An allocator.
* @param p Pointer to the memory to deallocate.
* @param n The number of objects space was allocated for.
* @param __a An allocator.
* @param __p Pointer to the memory to deallocate.
* @param __n The number of objects space was allocated for.
*
* Calls <tt> a.deallocate(p, n) </tt>
*/
......@@ -382,27 +387,27 @@ _GLIBCXX_ALLOC_TR_NESTED_TYPE(propagate_on_container_swap,
{ __a.deallocate(__p, __n); }
/**
* @brief Construct an object of type @a Tp
* @param a An allocator.
* @param p Pointer to memory of suitable size and alignment for Tp
* @param args Constructor arguments.
* @brief Construct an object of type @a _Tp
* @param __a An allocator.
* @param __p Pointer to memory of suitable size and alignment for Tp
* @param __args Constructor arguments.
*
* Calls <tt> a.construct(p, std::forward<Args>(args)...) </tt>
* Calls <tt> __a.construct(__p, std::forward<Args>(__args)...) </tt>
* if that expression is well-formed, otherwise uses placement-new
* to construct an object of type @a Tp at location @a p from the
* arguments @a args...
* to construct an object of type @a _Tp at location @a __p from the
* arguments @a __args...
*/
template<typename _Tp, typename... _Args>
static void construct(_Alloc& __a, _Tp* __p, _Args&&... __args)
{ _S_construct(__a, __p, std::forward<_Args>(__args)...); }
/**
* @brief Destroy an object of type @a Tp
* @param a An allocator.
* @param p Pointer to the object to destroy
* @brief Destroy an object of type @a _Tp
* @param __a An allocator.
* @param __p Pointer to the object to destroy
*
* Calls @c a.destroy(p) if that expression is well-formed,
* otherwise calls @c p->~Tp()
* Calls @c __a.destroy(__p) if that expression is well-formed,
* otherwise calls @c __p->~_Tp()
*/
template <class _Tp>
static void destroy(_Alloc& __a, _Tp* __p)
......@@ -410,10 +415,10 @@ _GLIBCXX_ALLOC_TR_NESTED_TYPE(propagate_on_container_swap,
/**
* @brief The maximum supported allocation size
* @param a An allocator.
* @return @c a.max_size() or @c numeric_limits<size_type>::max()
* @param __a An allocator.
* @return @c __a.max_size() or @c numeric_limits<size_type>::max()
*
* Returns @c a.max_size() if that expression is well-formed,
* Returns @c __a.max_size() if that expression is well-formed,
* otherwise returns @c numeric_limits<size_type>::max()
*/
static size_type max_size(const _Alloc& __a)
......@@ -421,11 +426,11 @@ _GLIBCXX_ALLOC_TR_NESTED_TYPE(propagate_on_container_swap,
/**
* @brief Obtain an allocator to use when copying a container.
* @param rhs An allocator.
* @return @c rhs.select_on_container_copy_construction() or @a rhs
* @param __rhs An allocator.
* @return @c __rhs.select_on_container_copy_construction() or @a __rhs
*
* Returns @c rhs.select_on_container_copy_construction() if that
* expression is well-formed, otherwise returns @a rhs
* Returns @c __rhs.select_on_container_copy_construction() if that
* expression is well-formed, otherwise returns @a __rhs
*/
static _Alloc
select_on_container_copy_construction(const _Alloc& __rhs)
......
......@@ -131,7 +131,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief [Re]sets the error state.
* @param state The new state flag(s) to set.
* @param __state The new state flag(s) to set.
*
* See std::ios_base::iostate for the possible bit values. Most
* users will not need to pass an argument.
......@@ -141,7 +141,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Sets additional flags in the error state.
* @param state The additional state flag(s) to set.
* @param __state The additional state flag(s) to set.
*
* See std::ios_base::iostate for the possible bit values.
*/
......@@ -216,7 +216,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Throwing exceptions on errors.
* @param except The new exceptions mask.
* @param __except The new exceptions mask.
*
* By default, error flags are set silently. You can set an
* exceptions mask for each stream; if a bit in the mask becomes set
......@@ -289,7 +289,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Ties this stream to an output stream.
* @param tiestr The output stream.
* @param __tiestr The output stream.
* @return The previously tied output stream, or NULL if the stream
* was not tied.
*
......@@ -315,7 +315,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Changing the underlying buffer.
* @param sb The new stream buffer.
* @param __sb The new stream buffer.
* @return The previous stream buffer.
*
* Associates a new buffer with the current stream, and clears the
......@@ -371,7 +371,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Sets a new @a empty character.
* @param ch The new character.
* @param __ch The new character.
* @return The previous fill character.
*
* The fill character is used to fill out space when P+ characters
......@@ -389,7 +389,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
// Locales:
/**
* @brief Moves to a new locale.
* @param loc The new locale.
* @param __loc The new locale.
* @return The previous locale.
*
* Calls @c ios_base::imbue(loc), and if a stream buffer is associated
......@@ -403,8 +403,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Squeezes characters.
* @param c The character to narrow.
* @param dfault The character to narrow.
* @param __c The character to narrow.
* @param __dfault The character to narrow.
* @return The narrowed character.
*
* Maps a character of @c char_type to a character of @c char,
......@@ -424,7 +424,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Widens characters.
* @param c The character to widen.
* @param __c The character to widen.
* @return The widened character.
*
* Maps a character of @c char to a character of @c char_type.
......
......@@ -104,13 +104,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
* output, returns codecvt_base::partial. Otherwise the
* conversion failed and codecvt_base::error is returned.
*
* @param state Persistent conversion state data.
* @param from Start of input.
* @param from_end End of input.
* @param from_next Returns start of unconverted data.
* @param to Start of output buffer.
* @param to_end End of output buffer.
* @param to_next Returns start of unused output area.
* @param __state Persistent conversion state data.
* @param __from Start of input.
* @param __from_end End of input.
* @param __from_next Returns start of unconverted data.
* @param __to Start of output buffer.
* @param __to_end End of output buffer.
* @param __to_next Returns start of unused output area.
* @return codecvt_base::result.
*/
result
......@@ -146,10 +146,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
* output has insufficient space, returns codecvt_base::partial.
* Otherwise the reset failed and codecvt_base::error is returned.
*
* @param state Persistent conversion state data.
* @param to Start of output buffer.
* @param to_end End of output buffer.
* @param to_next Returns start of unused output area.
* @param __state Persistent conversion state data.
* @param __to Start of output buffer.
* @param __to_end End of output buffer.
* @param __to_next Returns start of unused output area.
* @return codecvt_base::result.
*/
result
......@@ -184,13 +184,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
* output, returns codecvt_base::partial. Otherwise the
* conversion failed and codecvt_base::error is returned.
*
* @param state Persistent conversion state data.
* @param from Start of input.
* @param from_end End of input.
* @param from_next Returns start of unconverted data.
* @param to Start of output buffer.
* @param to_end End of output buffer.
* @param to_next Returns start of unused output area.
* @param __state Persistent conversion state data.
* @param __from Start of input.
* @param __from_end End of input.
* @param __from_next Returns start of unconverted data.
* @param __to Start of output buffer.
* @param __to_end End of output buffer.
* @param __to_next Returns start of unused output area.
* @return codecvt_base::result.
*/
result
......
// The template and inlines for the -*- C++ -*- gslice class.
// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2004, 2005, 2006, 2009, 2010
// Free Software Foundation, Inc.
// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2004, 2005, 2006, 2009, 2010,
// 2011 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
......@@ -74,11 +74,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
* Constructs a slice with as many dimensions as the length of the @a l
* and @a s arrays.
*
* @param o Offset in array of first element.
* @param l Array of dimension lengths.
* @param s Array of dimension strides between array elements.
* @param __o Offset in array of first element.
* @param __l Array of dimension lengths.
* @param __s Array of dimension strides between array elements.
*/
gslice(size_t, const valarray<size_t>&, const valarray<size_t>&);
gslice(size_t __o, const valarray<size_t>& __l,
const valarray<size_t>& __s);
// XXX: the IS says the copy-ctor and copy-assignment operators are
// synthesized by the compiler but they are just unsuitable
......
......@@ -427,15 +427,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief The type of an event callback function.
* @param event One of the members of the event enum.
* @param ios_base Reference to the ios_base object.
* @param int The integer provided when the callback was registered.
* @param __e One of the members of the event enum.
* @param __b Reference to the ios_base object.
* @param __i The integer provided when the callback was registered.
*
* Event callbacks are user defined functions that get called during
* several ios_base and basic_ios functions, specifically imbue(),
* copyfmt(), and ~ios().
*/
typedef void (*event_callback) (event, ios_base&, int);
typedef void (*event_callback) (event __e, ios_base& __b, int __i);
/**
* @brief Add the callback __fn with parameter __index.
......@@ -555,10 +555,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Setting new format flags all at once.
* @param fmtfl The new flags to set.
* @param __fmtfl The new flags to set.
* @return The previous format control flags.
*
* This function overwrites all the format flags with @a fmtfl.
* This function overwrites all the format flags with @a __fmtfl.
*/
fmtflags
flags(fmtflags __fmtfl)
......@@ -570,7 +570,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Setting new format flags.
* @param fmtfl Additional flags to set.
* @param __fmtfl Additional flags to set.
* @return The previous format control flags.
*
* This function sets additional flags in format control. Flags that
......@@ -586,8 +586,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Setting new format flags.
* @param fmtfl Additional flags to set.
* @param mask The flags mask for @a fmtfl.
* @param __fmtfl Additional flags to set.
* @param __mask The flags mask for @a fmtfl.
* @return The previous format control flags.
*
* This function clears @a mask in the format flags, then sets
......@@ -604,9 +604,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Clearing format flags.
* @param mask The flags to unset.
* @param __mask The flags to unset.
*
* This function clears @a mask in the format flags.
* This function clears @a __mask in the format flags.
*/
void
unsetf(fmtflags __mask)
......@@ -625,7 +625,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Changing flags.
* @param prec The new precision value.
* @param __prec The new precision value.
* @return The previous value of precision().
*/
streamsize
......@@ -648,7 +648,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Changing flags.
* @param wide The new width value.
* @param __wide The new width value.
* @return The previous value of width().
*/
streamsize
......@@ -662,7 +662,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
// [27.4.2.4] ios_base static members
/**
* @brief Interaction with the standard C I/O objects.
* @param sync Whether to synchronize or not.
* @param __sync Whether to synchronize or not.
* @return True if the standard streams were previously synchronized.
*
* The synchronization referred to is @e only that between the standard
......@@ -676,7 +676,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
// [27.4.2.3] ios_base locale functions
/**
* @brief Setting a new locale.
* @param loc The new locale.
* @param __loc The new locale.
* @return The previous locale.
*
* Sets the new locale for this stream, and then invokes each callback
......
......@@ -207,8 +207,8 @@ _GLIBCXX_HAS_NESTED_TYPE(difference_type)
/**
* @brief Obtain a pointer to an object
* @param r A reference to an object of type @c element_type
* @return @c addressof(r)
* @param __r A reference to an object of type @c element_type
* @return @c addressof(__r)
*/
static pointer
pointer_to(typename __ptrtr_not_void<element_type>::__type& __r) noexcept
......
......@@ -41,7 +41,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Return an iterator pointing to the first element of
* the container.
* @param cont Container.
* @param __cont Container.
*/
template<class _Container>
inline auto
......@@ -51,7 +51,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Return an iterator pointing to the first element of
* the const container.
* @param cont Container.
* @param __cont Container.
*/
template<class _Container>
inline auto
......@@ -61,7 +61,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Return an iterator pointing to one past the last element of
* the container.
* @param cont Container.
* @param __cont Container.
*/
template<class _Container>
inline auto
......@@ -71,7 +71,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Return an iterator pointing to one past the last element of
* the const container.
* @param cont Container.
* @param __cont Container.
*/
template<class _Container>
inline auto
......@@ -80,7 +80,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Return an iterator pointing to the first element of the array.
* @param arr Array.
* @param __arr Array.
*/
template<class _Tp, size_t _Nm>
inline _Tp*
......@@ -90,7 +90,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Return an iterator pointing to one past the last element
* of the array.
* @param arr Array.
* @param __arr Array.
*/
template<class _Tp, size_t _Nm>
inline _Tp*
......
......@@ -99,7 +99,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
static constexpr error_type error_space(_S_error_space);
/**
* One of <em>*?+{<em> was not preceded by a valid regular expression.
* One of <em>*?+{</em> was not preceded by a valid regular expression.
*/
static constexpr error_type error_badrepeat(_S_error_badrepeat);
......@@ -136,7 +136,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Constructs a regex_error object.
*
* @param ecode the regex error code.
* @param __ecode the regex error code.
*/
explicit
regex_error(regex_constants::error_type __ecode);
......
// The template and inlines for the -*- C++ -*- slice_array class.
// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2009,
// 2010 Free Software Foundation, Inc.
// 2010, 2011 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
......@@ -66,11 +66,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Construct a slice.
*
* @param o Offset in array of first element.
* @param d Number of elements in slice.
* @param s Stride between array elements.
* @param __o Offset in array of first element.
* @param __d Number of elements in slice.
* @param __s Stride between array elements.
*/
slice(size_t, size_t, size_t);
slice(size_t __o, size_t __d, size_t __s);
/// Return array offset of first slice element.
size_t start() const;
......
......@@ -144,12 +144,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Push an element onto a heap.
* @param first Start of heap.
* @param last End of heap + element.
* @param __first Start of heap.
* @param __last End of heap + element.
* @ingroup heap_algorithms
*
* This operation pushes the element at last-1 onto the valid heap over the
* range [first,last-1). After completion, [first,last) is a valid heap.
* This operation pushes the element at last-1 onto the valid heap
* over the range [__first,__last-1). After completion,
* [__first,__last) is a valid heap.
*/
template<typename _RandomAccessIterator>
inline void
......@@ -191,14 +192,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Push an element onto a heap using comparison functor.
* @param first Start of heap.
* @param last End of heap + element.
* @param comp Comparison functor.
* @param __first Start of heap.
* @param __last End of heap + element.
* @param __comp Comparison functor.
* @ingroup heap_algorithms
*
* This operation pushes the element at last-1 onto the valid heap over the
* range [first,last-1). After completion, [first,last) is a valid heap.
* Compare operations are performed using comp.
* This operation pushes the element at __last-1 onto the valid
* heap over the range [__first,__last-1). After completion,
* [__first,__last) is a valid heap. Compare operations are
* performed using comp.
*/
template<typename _RandomAccessIterator, typename _Compare>
inline void
......@@ -266,12 +268,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Pop an element off a heap.
* @param first Start of heap.
* @param last End of heap.
* @param __first Start of heap.
* @param __last End of heap.
* @ingroup heap_algorithms
*
* This operation pops the top of the heap. The elements first and last-1
* are swapped and [first,last-1) is made into a heap.
* This operation pops the top of the heap. The elements __first
* and __last-1 are swapped and [__first,__last-1) is made into a
* heap.
*/
template<typename _RandomAccessIterator>
inline void
......@@ -338,14 +341,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Pop an element off a heap using comparison functor.
* @param first Start of heap.
* @param last End of heap.
* @param comp Comparison functor to use.
* @param __first Start of heap.
* @param __last End of heap.
* @param __comp Comparison functor to use.
* @ingroup heap_algorithms
*
* This operation pops the top of the heap. The elements first and last-1
* are swapped and [first,last-1) is made into a heap. Comparisons are
* made using comp.
* This operation pops the top of the heap. The elements __first
* and __last-1 are swapped and [__first,__last-1) is made into a
* heap. Comparisons are made using comp.
*/
template<typename _RandomAccessIterator, typename _Compare>
inline void
......@@ -364,11 +367,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Construct a heap over a range.
* @param first Start of heap.
* @param last End of heap.
* @param __first Start of heap.
* @param __last End of heap.
* @ingroup heap_algorithms
*
* This operation makes the elements in [first,last) into a heap.
* This operation makes the elements in [__first,__last) into a heap.
*/
template<typename _RandomAccessIterator>
void
......@@ -402,13 +405,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Construct a heap over a range using comparison functor.
* @param first Start of heap.
* @param last End of heap.
* @param comp Comparison functor to use.
* @param __first Start of heap.
* @param __last End of heap.
* @param __comp Comparison functor to use.
* @ingroup heap_algorithms
*
* This operation makes the elements in [first,last) into a heap.
* Comparisons are made using comp.
* This operation makes the elements in [__first,__last) into a heap.
* Comparisons are made using __comp.
*/
template<typename _RandomAccessIterator, typename _Compare>
void
......@@ -443,11 +446,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Sort a heap.
* @param first Start of heap.
* @param last End of heap.
* @param __first Start of heap.
* @param __last End of heap.
* @ingroup heap_algorithms
*
* This operation sorts the valid heap in the range [first,last).
* This operation sorts the valid heap in the range [__first,__last).
*/
template<typename _RandomAccessIterator>
void
......@@ -470,13 +473,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Sort a heap using comparison functor.
* @param first Start of heap.
* @param last End of heap.
* @param comp Comparison functor to use.
* @param __first Start of heap.
* @param __last End of heap.
* @param __comp Comparison functor to use.
* @ingroup heap_algorithms
*
* This operation sorts the valid heap in the range [first,last).
* Comparisons are made using comp.
* This operation sorts the valid heap in the range [__first,__last).
* Comparisons are made using __comp.
*/
template<typename _RandomAccessIterator, typename _Compare>
void
......@@ -499,13 +502,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#ifdef __GXX_EXPERIMENTAL_CXX0X__
/**
* @brief Search the end of a heap.
* @param first Start of range.
* @param last End of range.
* @param __first Start of range.
* @param __last End of range.
* @return An iterator pointing to the first element not in the heap.
* @ingroup heap_algorithms
*
* This operation returns the last iterator i in [first, last) for which
* the range [first, i) is a heap.
* This operation returns the last iterator i in [__first, __last) for which
* the range [__first, i) is a heap.
*/
template<typename _RandomAccessIterator>
inline _RandomAccessIterator
......@@ -524,14 +527,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Search the end of a heap using comparison functor.
* @param first Start of range.
* @param last End of range.
* @param comp Comparison functor to use.
* @param __first Start of range.
* @param __last End of range.
* @param __comp Comparison functor to use.
* @return An iterator pointing to the first element not in the heap.
* @ingroup heap_algorithms
*
* This operation returns the last iterator i in [first, last) for which
* the range [first, i) is a heap. Comparisons are made using comp.
* This operation returns the last iterator i in [__first, __last) for which
* the range [__first, i) is a heap. Comparisons are made using __comp.
*/
template<typename _RandomAccessIterator, typename _Compare>
inline _RandomAccessIterator
......@@ -550,8 +553,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Determines whether a range is a heap.
* @param first Start of range.
* @param last End of range.
* @param __first Start of range.
* @param __last End of range.
* @return True if range is a heap, false otherwise.
* @ingroup heap_algorithms
*/
......@@ -562,9 +565,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Determines whether a range is a heap using comparison functor.
* @param first Start of range.
* @param last End of range.
* @param comp Comparison functor to use.
* @param __first Start of range.
* @param __last End of range.
* @param __comp Comparison functor to use.
* @return True if range is a heap, false otherwise.
* @ingroup heap_algorithms
*/
......
......@@ -272,8 +272,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
//@{
/**
* @param x A %reverse_iterator.
* @param y A %reverse_iterator.
* @param __x A %reverse_iterator.
* @param __y A %reverse_iterator.
* @return A simple bool.
*
* Reverse iterators forward many operations to their underlying base()
......@@ -408,7 +408,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
back_insert_iterator(_Container& __x) : container(&__x) { }
/**
* @param value An instance of whatever type
* @param __value An instance of whatever type
* container_type::const_reference is; presumably a
* reference-to-const T for container<T>.
* @return This %iterator, for chained operations.
......@@ -458,8 +458,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
};
/**
* @param x A container of arbitrary type.
* @return An instance of back_insert_iterator working on @p x.
* @param __x A container of arbitrary type.
* @return An instance of back_insert_iterator working on @p __x.
*
* This wrapper function helps in creating back_insert_iterator instances.
* Typing the name of the %iterator requires knowing the precise full
......@@ -498,7 +498,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
explicit front_insert_iterator(_Container& __x) : container(&__x) { }
/**
* @param value An instance of whatever type
* @param __value An instance of whatever type
* container_type::const_reference is; presumably a
* reference-to-const T for container<T>.
* @return This %iterator, for chained operations.
......@@ -548,7 +548,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
};
/**
* @param x A container of arbitrary type.
* @param __x A container of arbitrary type.
* @return An instance of front_insert_iterator working on @p x.
*
* This wrapper function helps in creating front_insert_iterator instances.
......@@ -597,7 +597,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
: container(&__x), iter(__i) {}
/**
* @param value An instance of whatever type
* @param __value An instance of whatever type
* container_type::const_reference is; presumably a
* reference-to-const T for container<T>.
* @return This %iterator, for chained operations.
......@@ -662,8 +662,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
};
/**
* @param x A container of arbitrary type.
* @return An instance of insert_iterator working on @p x.
* @param __x A container of arbitrary type.
* @return An instance of insert_iterator working on @p __x.
*
* This wrapper function helps in creating insert_iterator instances.
* Typing the name of the %iterator requires knowing the precise full
......
......@@ -98,12 +98,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief A generalization of pointer arithmetic.
* @param first An input iterator.
* @param last An input iterator.
* @param __first An input iterator.
* @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.
......@@ -156,12 +157,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief A generalization of pointer arithmetic.
* @param i An input iterator.
* @param n The @a delta by which to change @p i.
* @param __i An input iterator.
* @param __n The @a delta by which to change @p __i.
* @return Nothing.
*
* 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.
* 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.
......
......@@ -73,9 +73,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
* For each element in the range @p [first,last) assigns @p value and
* increments @p value as if by @p ++value.
*
* @param first Start of range.
* @param last End of range.
* @param value Starting value.
* @param __first Start of range.
* @param __last End of range.
* @param __value Starting value.
* @return Nothing.
*/
template<typename _ForwardIterator, typename _Tp>
......@@ -111,9 +111,9 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
* Accumulates the values in the range [first,last) using operator+(). The
* initial value is @a init. The values are processed in order.
*
* @param first Start of range.
* @param last End of range.
* @param init Starting value to add other values to.
* @param __first Start of range.
* @param __last End of range.
* @param __init Starting value to add other values to.
* @return The final sum.
*/
template<typename _InputIterator, typename _Tp>
......@@ -136,10 +136,10 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
* object @a binary_op. The initial value is @a init. The values are
* processed in order.
*
* @param first Start of range.
* @param last End of range.
* @param init Starting value to add other values to.
* @param binary_op Function object to accumulate with.
* @param __first Start of range.
* @param __last End of range.
* @param __init Starting value to add other values to.
* @param __binary_op Function object to accumulate with.
* @return The final sum.
*/
template<typename _InputIterator, typename _Tp, typename _BinaryOperation>
......@@ -164,10 +164,10 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
* value using operator+(). The values in the ranges are processed in
* order.
*
* @param first1 Start of range 1.
* @param last1 End of range 1.
* @param first2 Start of range 2.
* @param init Starting value to add other values to.
* @param __first1 Start of range 1.
* @param __last1 End of range 1.
* @param __first2 Start of range 2.
* @param __init Starting value to add other values to.
* @return The final inner product.
*/
template<typename _InputIterator1, typename _InputIterator2, typename _Tp>
......@@ -193,12 +193,12 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
* the accumulated value using @a binary_op1. The values in the ranges are
* processed in order.
*
* @param first1 Start of range 1.
* @param last1 End of range 1.
* @param first2 Start of range 2.
* @param init Starting value to add other values to.
* @param binary_op1 Function object to accumulate with.
* @param binary_op2 Function object to apply to pairs of input values.
* @param __first1 Start of range 1.
* @param __last1 End of range 1.
* @param __first2 Start of range 2.
* @param __init Starting value to add other values to.
* @param __binary_op1 Function object to accumulate with.
* @param __binary_op2 Function object to apply to pairs of input values.
* @return The final inner product.
*/
template<typename _InputIterator1, typename _InputIterator2, typename _Tp,
......@@ -228,9 +228,9 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
* first value of the input, the second value in result is the sum of the
* first and second input values, and so on.
*
* @param first Start of input range.
* @param last End of input range.
* @param result Output to write sums to.
* @param __first Start of input range.
* @param __last End of input range.
* @param __result Output to write sums to.
* @return Iterator pointing just beyond the values written to result.
*/
template<typename _InputIterator, typename _OutputIterator>
......@@ -267,9 +267,9 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
* first value of the input, the second value in result is the sum of the
* first and second input values, and so on.
*
* @param first Start of input range.
* @param last End of input range.
* @param result Output to write sums to.
* @param __first Start of input range.
* @param __last End of input range.
* @param __result Output to write sums to.
* @return Iterator pointing just beyond the values written to result.
*/
template<typename _InputIterator, typename _OutputIterator,
......@@ -304,9 +304,9 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
* Computes the difference between adjacent values in the range
* [first,last) using operator-() and writes the result to @a result.
*
* @param first Start of input range.
* @param last End of input range.
* @param result Output to write sums to.
* @param __first Start of input range.
* @param __last End of input range.
* @param __result Output to write sums to.
* @return Iterator pointing just beyond the values written to result.
*
* _GLIBCXX_RESOLVE_LIB_DEFECTS
......@@ -342,12 +342,12 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
* @brief Return differences between adjacent values.
*
* Computes the difference between adjacent values in the range
* [first,last) using the function object @a binary_op and writes the
* result to @a result.
* [__first,__last) using the function object @a __binary_op and writes the
* result to @a __result.
*
* @param first Start of input range.
* @param last End of input range.
* @param result Output to write sums to.
* @param __first Start of input range.
* @param __last End of input range.
* @param __result Output to write sums to.
* @return Iterator pointing just beyond the values written to result.
*
* _GLIBCXX_RESOLVE_LIB_DEFECTS
......
......@@ -262,8 +262,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief A convenience wrapper for creating a pair from two objects.
* @param x The first object.
* @param y The second object.
* @param __x The first object.
* @param __y The second object.
* @return A newly-constructed pair<> object of the appropriate type.
*
* The standard requires that the objects be passed by reference-to-const,
......
......@@ -200,7 +200,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Add data to the end of the %queue.
* @param x Data to be added.
* @param __x Data to be added.
*
* This is a typical %queue operation. The function creates an
* element at the end of the %queue and assigns the given data
......@@ -253,8 +253,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Queue equality comparison.
* @param x A %queue.
* @param y A %queue of the same type as @a x.
* @param __x A %queue.
* @param __y A %queue of the same type as @a __x.
* @return True iff the size and elements of the queues are equal.
*
* This is an equivalence relation. Complexity and semantics depend on the
......@@ -269,9 +269,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Queue ordering relation.
* @param x A %queue.
* @param y A %queue of the same type as @a x.
* @return True iff @a x is lexicographically less than @a y.
* @param __x A %queue.
* @param __y A %queue of the same type as @a x.
* @return True iff @a __x is lexicographically less than @a __y.
*
* This is an total ordering relation. Complexity and semantics
* depend on the underlying sequence type, but the expected rules
......@@ -407,14 +407,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Builds a %queue from a range.
* @param first An input iterator.
* @param last An input iterator.
* @param x A comparison functor describing a strict weak ordering.
* @param s An initial sequence with which to start.
* @param __first An input iterator.
* @param __last An input iterator.
* @param __x A comparison functor describing a strict weak ordering.
* @param __s An initial sequence with which to start.
*
* Begins by copying @a s, inserting a copy of the elements
* from @a [first,last) into the copy of @a s, then ordering
* the copy according to @a x.
* Begins by copying @a __s, inserting a copy of the elements
* from @a [first,last) into the copy of @a __s, then ordering
* the copy according to @a __x.
*
* For more information on function objects, see the
* documentation on @link functors functor base
......@@ -480,7 +480,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Add data to the %queue.
* @param x Data to be added.
* @param __x Data to be added.
*
* This is a typical %queue operation.
* The time complexity of the operation depends on the underlying
......
......@@ -77,9 +77,9 @@ namespace std _GLIBCXX_VISIBILITY(default)
/**
* @brief Defines @c != for arbitrary types, in terms of @c ==.
* @param x A thing.
* @param y Another thing.
* @return x != y
* @param __x A thing.
* @param __y Another thing.
* @return __x != __y
*
* This function uses @c == to determine its result.
*/
......@@ -90,9 +90,9 @@ namespace std _GLIBCXX_VISIBILITY(default)
/**
* @brief Defines @c > for arbitrary types, in terms of @c <.
* @param x A thing.
* @param y Another thing.
* @return x > y
* @param __x A thing.
* @param __y Another thing.
* @return __x > __y
*
* This function uses @c < to determine its result.
*/
......@@ -103,9 +103,9 @@ namespace std _GLIBCXX_VISIBILITY(default)
/**
* @brief Defines @c <= for arbitrary types, in terms of @c <.
* @param x A thing.
* @param y Another thing.
* @return x <= y
* @param __x A thing.
* @param __y Another thing.
* @return __x <= __y
*
* This function uses @c < to determine its result.
*/
......@@ -116,9 +116,9 @@ namespace std _GLIBCXX_VISIBILITY(default)
/**
* @brief Defines @c >= for arbitrary types, in terms of @c <.
* @param x A thing.
* @param y Another thing.
* @return x >= y
* @param __x A thing.
* @param __y Another thing.
* @return __x >= __y
*
* This function uses @c < to determine its result.
*/
......
......@@ -174,7 +174,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Add data to the top of the %stack.
* @param x Data to be added.
* @param __x Data to be added.
*
* This is a typical %stack operation. The function creates an
* element at the top of the %stack and assigns the given data
......@@ -227,8 +227,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Stack equality comparison.
* @param x A %stack.
* @param y A %stack of the same type as @a x.
* @param __x A %stack.
* @param __y A %stack of the same type as @a __x.
* @return True iff the size and elements of the stacks are equal.
*
* This is an equivalence relation. Complexity and semantics
......@@ -244,9 +244,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Stack ordering relation.
* @param x A %stack.
* @param y A %stack of the same type as @a x.
* @return True iff @a x is lexicographically less than @a y.
* @param __x A %stack.
* @param __y A %stack of the same type as @a x.
* @return True iff @a x is lexicographically less than @a __y.
*
* This is an total ordering relation. Complexity and semantics
* depend on the underlying sequence type, but the expected rules
......
......@@ -67,15 +67,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Allocates a temporary buffer.
* @param len The number of objects of type Tp.
* @param __len The number of objects of type Tp.
* @return See full description.
*
* Reinventing the wheel, but this time with prettier spokes!
*
* This function tries to obtain storage for @c len adjacent Tp
* This function tries to obtain storage for @c __len adjacent Tp
* objects. The objects themselves are not constructed, of course.
* A pair<> is returned containing <em>the buffer s address and
* capacity (in the units of sizeof(Tp)), or a pair of 0 values if
* capacity (in the units of sizeof(_Tp)), or a pair of 0 values if
* no storage can be obtained.</em> Note that the capacity obtained
* may be less than that requested if the memory is unavailable;
* you should compare len with the .second return value.
......@@ -104,10 +104,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief The companion to get_temporary_buffer().
* @param p A buffer previously allocated by get_temporary_buffer.
* @param __p A buffer previously allocated by get_temporary_buffer.
* @return None.
*
* Frees the memory pointed to by p.
* Frees the memory pointed to by __p.
*/
template<typename _Tp>
inline void
......
......@@ -97,10 +97,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Copies the range [first,last) into result.
* @param first An input iterator.
* @param last An input iterator.
* @param result An output iterator.
* @return result + (first - last)
* @param __first An input iterator.
* @param __last An input iterator.
* @param __result An output iterator.
* @return __result + (__first - __last)
*
* Like copy(), but does not require an initialized output range.
*/
......@@ -154,9 +154,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Copies the value x into the range [first,last).
* @param first An input iterator.
* @param last An input iterator.
* @param x The source value.
* @param __first An input iterator.
* @param __last An input iterator.
* @param __x The source value.
* @return Nothing.
*
* Like fill(), but does not require an initialized output range.
......@@ -208,9 +208,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Copies the value x into the range [first,first+n).
* @param first An input iterator.
* @param n The number of copies to make.
* @param x The source value.
* @param __first An input iterator.
* @param __n The number of copies to make.
* @param __x The source value.
* @return Nothing.
*
* Like fill_n(), but does not require an initialized output range.
......@@ -637,10 +637,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Copies the range [first,first+n) into result.
* @param first An input iterator.
* @param n The number of elements to copy.
* @param result An output iterator.
* @return result + n
* @param __first An input iterator.
* @param __n The number of elements to copy.
* @param __result An output iterator.
* @return __result + __n
*
* Like copy_n(), but does not require an initialized output range.
*/
......
......@@ -145,9 +145,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
* the only type written by this iterator and there must be an
* operator<<(Tp) defined.
*
* @param Tp The type to write to the ostream.
* @param CharT The ostream char_type.
* @param Traits The ostream char_traits.
* @tparam _Tp The type to write to the ostream.
* @tparam _CharT The ostream char_type.
* @tparam _Traits The ostream char_traits.
*/
template<typename _Tp, typename _CharT = char,
typename _Traits = char_traits<_CharT> >
......@@ -177,8 +177,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
* written to the stream. The delimiter is not copied, and thus must
* not be destroyed while this iterator is in use.
*
* @param s Underlying ostream to write to.
* @param c CharT delimiter string to insert.
* @param __s Underlying ostream to write to.
* @param __c CharT delimiter string to insert.
*/
ostream_iterator(ostream_type& __s, const _CharT* __c)
: _M_stream(&__s), _M_string(__c) { }
......
......@@ -22,7 +22,7 @@
// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
// <http://www.gnu.org/licenses/>.
/** @file debug/safe_locale_iterator.tcc
/** @file debug/safe_local_iterator.tcc
* This file is a GNU debug extension to the Standard C++ Library.
*/
......
......@@ -104,7 +104,7 @@ namespace __gnu_debug
* may only be used by deriving from it and passing the name of the
* derived class as its template parameter via the curiously
* recurring template pattern. The derived class must have @c
* iterator and @const_iterator types that are instantiations of
* iterator and @c const_iterator types that are instantiations of
* class template _Safe_iterator for this sequence. Iterators will
* then be tracked automatically.
*/
......@@ -113,16 +113,16 @@ namespace __gnu_debug
{
public:
/** Invalidates all iterators @c x that reference this sequence,
are not singular, and for which @c pred(x) returns @c
true. @c pred will be invoked with the normal iterators nested
are not singular, and for which @c __pred(x) returns @c
true. @c __pred will be invoked with the normal iterators nested
in the safe ones. */
template<typename _Predicate>
void
_M_invalidate_if(_Predicate __pred);
/** Transfers all iterators @c x that reference @c from sequence,
are not singular, and for which @c pred(x) returns @c
true. @c pred will be invoked with the normal iterators nested
are not singular, and for which @c __pred(x) returns @c
true. @c __pred will be invoked with the normal iterators nested
in the safe ones. */
template<typename _Predicate>
void
......
......@@ -55,7 +55,7 @@ namespace __gnu_debug
{ }
/** Initialize the iterator to reference the container pointed to
* by @p__seq. @p __constant is true when we are initializing a
* by @p __seq. @p __constant is true when we are initializing a
* constant local iterator, and false if it is a mutable local iterator.
* Note that @p __seq may be NULL, in which case the iterator will be
* singular. Otherwise, the iterator will reference @p __seq and
......
......@@ -48,9 +48,9 @@ namespace __gnu_debug
* template may only be used by deriving from it and passing the name
* of the derived class as its template parameter via the curiously
* recurring template pattern. The derived class must have @c
* iterator and @const_iterator types that are instantiations of
* iterator and @c const_iterator types that are instantiations of
* class template _Safe_iterator for this container and @c local_iterator
* and @const_local_iterator types that are instantiations of class
* and @c const_local_iterator types that are instantiations of class
* template _Safe_local_iterator for this container. Iterators will
* then be tracked automatically.
*/
......@@ -59,16 +59,16 @@ namespace __gnu_debug
{
public:
/** Invalidates all iterators @c x that reference this container,
are not singular, and for which @c pred(x) returns @c
true. @c pred will be invoked with the normal iterators nested
are not singular, and for which @c __pred(x) returns @c
true. @c __pred will be invoked with the normal iterators nested
in the safe ones. */
template<typename _Predicate>
void
_M_invalidate_if(_Predicate __pred);
/** Invalidates all local iterators @c x that reference this container,
are not singular, and for which @c pred(x) returns @c
true. @c pred will be invoked with the normal ilocal iterators
are not singular, and for which @c __pred(x) returns @c
true. @c __pred will be invoked with the normal ilocal iterators
nested in the safe ones. */
template<typename _Predicate>
void
......
......@@ -105,9 +105,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Copies the range [first,first+count) into [result,result+count).
* @param first An input iterator.
* @param count The number of elements to copy.
* @param result An output iterator.
* @param __first An input iterator.
* @param __count The number of elements to copy.
* @param __result An output iterator.
* @return A std::pair composed of first+count and result+count.
*
* This is an SGI extension.
......@@ -185,10 +185,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief @c memcmp on steroids.
* @param first1 An input iterator.
* @param last1 An input iterator.
* @param first2 An input iterator.
* @param last2 An input iterator.
* @param __first1 An input iterator.
* @param __last1 An input iterator.
* @param __first2 An input iterator.
* @param __last2 An input iterator.
* @return An int, as with @c memcmp.
*
* The return value will be less than zero if the first range is
......@@ -533,9 +533,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Find the median of three values.
* @param a A value.
* @param b A value.
* @param c A value.
* @param __a A value.
* @param __b A value.
* @param __c A value.
* @return One of @p a, @p b or @p c.
*
* If @c {l,m,n} is some convolution of @p {a,b,c} such that @c l<=m<=n
......@@ -566,10 +566,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Find the median of three values using a predicate for comparison.
* @param a A value.
* @param b A value.
* @param c A value.
* @param comp A binary predicate.
* @param __a A value.
* @param __b A value.
* @param __c A value.
* @param __comp A binary predicate.
* @return One of @p a, @p b or @p c.
*
* If @c {l,m,n} is some convolution of @p {a,b,c} such that @p comp(l,m)
......
......@@ -59,7 +59,6 @@ namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
* It is to be used only for built-in types or PODs. Notable
* differences are:
*
* @detail
* 1. Not all accessor functions are present.
* 2. Used ONLY for PODs.
* 3. No Allocator template argument. Uses ::operator new() to get
......@@ -560,7 +559,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
* @param __addr The pointer to the memory block to be
* validated.
*
* @detail Validates the memory block passed to this function and
* Validates the memory block passed to this function and
* appropriately performs the action of managing the free list of
* blocks by adding this block to the free list or deleting this
* or larger blocks from the free list.
......@@ -757,7 +756,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
*
* @throw std::bad_alloc. If memory can not be allocated.
*
* @detail Complexity: O(1), but internally depends upon the
* Complexity: O(1), but internally depends upon the
* complexity of the function free_list::_M_get. The part where
* the bitmap headers are written has complexity: O(X),where X
* is the number of blocks of size sizeof(value_type) within
......@@ -813,7 +812,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
*
* @throw std::bad_alloc. If memory can not be allocated.
*
* @detail Complexity: Worst case complexity is O(N), but that
* Complexity: Worst case complexity is O(N), but that
* is hardly ever hit. If and when this particular case is
* encountered, the next few cases are guaranteed to have a
* worst case complexity of O(1)! That's why this function
......@@ -906,7 +905,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/** @brief Deallocates memory that belongs to a single object of
* size sizeof(_Tp).
*
* @detail Complexity: O(lg(N)), but the worst case is not hit
* Complexity: O(lg(N)), but the worst case is not hit
* often! This is because containers usually deallocate memory
* close to each other and this case is handled in O(1) time by
* the deallocate function.
......
......@@ -104,7 +104,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
*
* @c binary_compose is constructed from three functors, @c f, @c g1,
* and @c g2. Its @c operator() returns @c f(g1(x),g2(x)). The function
* @compose2 takes f, g1, and g2, and constructs the @c binary_compose
* compose2 takes f, g1, and g2, and constructs the @c binary_compose
* instance for you. For example, if @c f returns an int, then
* \code
* int answer = (compose2(f,g1,g2))(x);
......
......@@ -110,10 +110,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Copies the range [first,last) into result.
* @param first An input iterator.
* @param last An input iterator.
* @param result An output iterator.
* @return result + (first - last)
* @param __first An input iterator.
* @param __count Length
* @param __result An output iterator.
* @return __result + (__first + __count)
* @ingroup SGIextensions
*
* Like copy(), but does not require an initialized output range.
......
......@@ -708,7 +708,7 @@ namespace __gnu_pbds
* @tparam _ATraits Element access traits.
* @tparam Tag Instantiating data structure type,
* see container_tag.
* @tparam Node_Update Updates nodes,
* @tparam Node_Update Updates trie nodes,
* restores invariants when invalidated.
* XXX See design::tree-based-containers::node invariants.
* @tparam _Alloc Allocator type.
......
......@@ -66,9 +66,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
stdio_filebuf() : std::basic_filebuf<_CharT, _Traits>() {}
/**
* @param fd An open file descriptor.
* @param mode Same meaning as in a standard filebuf.
* @param size Optimal or preferred size of internal buffer, in chars.
* @param __fd An open file descriptor.
* @param __mode Same meaning as in a standard filebuf.
* @param __size Optimal or preferred size of internal buffer,
* in chars.
*
* This constructor associates a file stream buffer with an open
* POSIX file descriptor. The file descriptor will be automatically
......@@ -78,10 +79,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
size_t __size = static_cast<size_t>(BUFSIZ));
/**
* @param f An open @c FILE*.
* @param mode Same meaning as in a standard filebuf.
* @param size Optimal or preferred size of internal buffer, in chars.
* Defaults to system's @c BUFSIZ.
* @param __f An open @c FILE*.
* @param __mode Same meaning as in a standard filebuf.
* @param __size Optimal or preferred size of internal buffer,
* in chars. Defaults to system's @c BUFSIZ.
*
* This constructor associates a file stream buffer with an open
* C @c FILE*. The @c FILE* will not be automatically closed when the
......
......@@ -141,7 +141,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
// NB: per LWG issue 42, semantics different from IS:
/**
* @brief Construct string with copy of value of @a str.
* @brief Construct string with copy of value of @a __str.
* @param __str Source string.
*/
__versa_string(const __versa_string& __str)
......@@ -153,7 +153,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
* @param __str Source string.
*
* The newly-constructed %string contains the exact contents of
* @a str. The contents of @a str are a valid, but unspecified
* @a __str. The contents of @a __str are a valid, but unspecified
* string.
*/
__versa_string(__versa_string&& __str) noexcept
......@@ -2022,14 +2022,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Compare substring against a character array.
* @param __pos1 Index of first character of substring.
* @param __pos Index of first character of substring.
* @param __n1 Number of characters in substring.
* @param __s character array to compare against.
* @param __n2 Number of characters of s.
* @return Integer < 0, 0, or > 0.
*
* Form the substring of this string from the @a __n1
* characters starting at @a __pos1. Form a string from the
* characters starting at @a __pos. Form a string from the
* first @a __n2 characters of @a __s. Returns an integer < 0
* if this substring is ordered before the string from @a __s,
* 0 if their values are equivalent, or > 0 if this substring
......@@ -2037,11 +2037,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
* effective length rlen of the strings to compare as the
* smallest of the length of the substring and @a __n2. The
* function then compares the two strings by calling
* traits::compare(substring.data(),s,rlen). If the result of
* traits::compare(substring.data(),__s,rlen). If the result of
* the comparison is nonzero returns it, otherwise the shorter
* one is ordered first.
*
* NB: s must have at least n2 characters, <em>\\0</em> has no special
* NB: __s must have at least n2 characters, <em>\\0</em> has no special
* meaning.
*/
int
......
......@@ -365,7 +365,7 @@ namespace __gnu_parallel
typedef _PseudoSequenceIterator<_Tp, uint64_t> iterator;
/** @brief Constructor.
* @param _M_val Element of the sequence.
* @param __val Element of the sequence.
* @param __count Number of (virtual) copies.
*/
_PseudoSequence(const _Tp& __val, _DifferenceType __count)
......
......@@ -228,8 +228,8 @@ namespace __gnu_parallel
_It2 __begin2_iterator;
/** @brief Constructor.
* @param b1 Begin iterator of first sequence.
* @param b2 Begin iterator of second sequence. */
* @param __b1 Begin iterator of first sequence.
* @param __b2 Begin iterator of second sequence. */
explicit
__inner_product_selector(_It __b1, _It2 __b2)
: __begin1_iterator(__b1), __begin2_iterator(__b2) { }
......@@ -291,7 +291,7 @@ namespace __gnu_parallel
* @param __i iterator referencing object. */
template<typename _It>
void
operator()(_It) { }
operator()(_It __i) { }
};
/** @brief Reduction function doing nothing. */
......
......@@ -641,10 +641,7 @@ namespace __gnu_parallel
/** @brief Multi-way merging procedure for a high branching factor,
* requiring sentinels to exist.
*
* @param __stable The value must the same as for the used LoserTrees.
* @param UnguardedLoserTree _Loser Tree variant to use for the unguarded
* merging.
* @param GuardedLoserTree _Loser Tree variant to use for the guarded
* @tparam UnguardedLoserTree _Loser Tree variant to use for the unguarded
* merging.
*
* @param __seqs_begin Begin iterator of iterator pair input sequence.
......@@ -911,7 +908,6 @@ namespace __gnu_parallel
* @param __comp Comparator.
* @param __length Maximum length to merge, possibly larger than the
* number of elements available.
* @param __stable Stable merging incurs a performance penalty.
* @param __sentinel The sequences have __a __sentinel element.
* @return End iterator of output sequence. */
template<bool __stable,
......@@ -1206,7 +1202,9 @@ namespace __gnu_parallel
*
* Must not be called if the number of sequences is 1.
*
* @param _Splitter functor to split input (either __exact or sampling based)
* @tparam _Splitter functor to split input (either __exact or sampling based)
* @tparam __stable Stable merging incurs a performance penalty.
* @tparam __sentinel Ignored.
*
* @param __seqs_begin Begin iterator of iterator pair input sequence.
* @param __seqs_end End iterator of iterator pair input sequence.
......@@ -1214,8 +1212,6 @@ namespace __gnu_parallel
* @param __comp Comparator.
* @param __length Maximum length to merge, possibly larger than the
* number of elements available.
* @param __stable Stable merging incurs a performance penalty.
* @param __sentinel Ignored.
* @return End iterator of output sequence.
*/
template<bool __stable,
......@@ -1396,11 +1392,11 @@ namespace __gnu_parallel
* @post return __value - __target = min(__length, number of elements in all
* sequences).
*
* @param _RAIterPairIterator iterator over sequence
* @tparam _RAIterPairIterator iterator over sequence
* of pairs of iterators
* @param _RAIterOut iterator over target sequence
* @param _DifferenceTp difference type for the sequence
* @param _Compare strict weak ordering type to compare elements
* @tparam _RAIterOut iterator over target sequence
* @tparam _DifferenceTp difference type for the sequence
* @tparam _Compare strict weak ordering type to compare elements
* in sequences
*
* @param __seqs_begin __begin of sequence __sequence
......@@ -1760,11 +1756,11 @@ namespace __gnu_parallel
*
* @see stable_multiway_merge_sentinels
*
* @param _RAIterPairIterator iterator over sequence
* @tparam _RAIterPairIterator iterator over sequence
* of pairs of iterators
* @param _RAIterOut iterator over target sequence
* @param _DifferenceTp difference type for the sequence
* @param _Compare strict weak ordering type to compare elements
* @tparam _RAIterOut iterator over target sequence
* @tparam _DifferenceTp difference type for the sequence
* @tparam _Compare strict weak ordering type to compare elements
* in sequences
*
* @param __seqs_begin __begin of sequence __sequence
......
......@@ -387,7 +387,6 @@ namespace __gnu_parallel
* @param __begin Begin iterator of sequence.
* @param __end End iterator of sequence.
* @param __comp Comparator.
* @param __n Length of sequence.
* @param __num_threads Number of threads to use.
*/
template<bool __stable, bool __exact, typename _RAIter,
......
......@@ -80,7 +80,6 @@ namespace __gnu_parallel
* @param __result Begin iterator of output sequence.
* @param __bin_op Associative binary function.
* @param __n Length of sequence.
* @param __num_threads Number of threads to use.
* @return End iterator of output sequence.
*/
template<typename _IIter,
......
......@@ -64,7 +64,7 @@ namespace __gnu_parallel
public:
/** @brief Constructor. Not to be called concurrent, of course.
* @param _M_max_size Maximal number of elements to be contained. */
* @param __max_size Maximal number of elements to be contained. */
_RestrictedBoundedConcurrentQueue(_SequenceIndex __max_size)
{
_M_max_size = __max_size;
......
......@@ -104,7 +104,7 @@ namespace __gnu_parallel
}
/** @brief Generate a number of random bits, run-time parameter.
* @param bits Number of bits to generate. */
* @param __bits Number of bits to generate. */
unsigned long
__genrand_bits(int __bits)
{
......
......@@ -44,7 +44,7 @@ namespace __gnu_parallel
* @brief Precalculate __advances for Knuth-Morris-Pratt algorithm.
* @param __elements Begin iterator of sequence to search for.
* @param __length Length of sequence to search for.
* @param __advances Returned __offsets.
* @param __off Returned __offsets.
*/
template<typename _RAIter, typename _DifferenceTp>
void
......
......@@ -67,6 +67,7 @@ namespace __gnu_parallel
* @param __begin Begin iterator of input sequence.
* @param __end End iterator of input sequence.
* @param __comp Comparator.
* @tparam __stable Sort stable.
* @callgraph
*/
template<bool __stable, typename _RAIter, typename _Compare>
......@@ -90,6 +91,7 @@ namespace __gnu_parallel
* @param __begin Begin iterator of input sequence.
* @param __end End iterator of input sequence.
* @param __comp Comparator.
* @tparam __stable Sort stable.
* @callgraph
*/
template<bool __stable, typename _RAIter, typename _Compare>
......@@ -110,6 +112,7 @@ namespace __gnu_parallel
* @param __begin Begin iterator of input sequence.
* @param __end End iterator of input sequence.
* @param __comp Comparator.
* @tparam __stable Sort stable.
* @callgraph
*/
template<bool __stable, typename _RAIter, typename _Compare>
......@@ -129,6 +132,7 @@ namespace __gnu_parallel
* @param __begin Begin iterator of input sequence.
* @param __end End iterator of input sequence.
* @param __comp Comparator.
* @tparam __stable Sort stable.
* @callgraph
*/
template<bool __stable, typename _RAIter, typename _Compare>
......@@ -149,7 +153,7 @@ namespace __gnu_parallel
* @param __begin Begin iterator of input sequence.
* @param __end End iterator of input sequence.
* @param __comp Comparator.
* @param __stable Sort __stable.
* @tparam __stable Sort stable.
* @callgraph
*/
template<bool __stable, typename _RAIter, typename _Compare>
......@@ -171,6 +175,7 @@ namespace __gnu_parallel
* @param __begin Begin iterator of input sequence.
* @param __end End iterator of input sequence.
* @param __comp Comparator.
* @tparam __stable Sort stable.
* @callgraph
*/
template<bool __stable, typename _RAIter, typename _Compare>
......@@ -190,7 +195,7 @@ namespace __gnu_parallel
* @param __begin Begin iterator of input sequence.
* @param __end End iterator of input sequence.
* @param __comp Comparator.
* @param __stable Sort __stable.
* @tparam __stable Sort stable.
* @callgraph
*/
template<bool __stable, typename _RAIter, typename _Compare>
......
......@@ -831,10 +831,10 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
/**
* @brief Use a subset of a string.
* @param s A string of @a 0 and @a 1 characters.
* @param position Index of the first character in @a s to use;
* @param __s A string of @a 0 and @a 1 characters.
* @param __position Index of the first character in @a __s to use;
* defaults to zero.
* @throw std::out_of_range If @a pos is bigger the size of @a s.
* @throw std::out_of_range If @a pos is bigger the size of @a __s.
* @throw std::invalid_argument If a character appears in the string
* which is neither @a 0 nor @a 1.
*/
......@@ -854,10 +854,11 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
/**
* @brief Use a subset of a string.
* @param s A string of @a 0 and @a 1 characters.
* @param position Index of the first character in @a s to use.
* @param n The number of characters to copy.
* @throw std::out_of_range If @a pos is bigger the size of @a s.
* @param __s A string of @a 0 and @a 1 characters.
* @param __position Index of the first character in @a __s to use.
* @param __n The number of characters to copy.
* @throw std::out_of_range If @a __position is bigger the size
* of @a __s.
* @throw std::invalid_argument If a character appears in the string
* which is neither @a 0 nor @a 1.
*/
......@@ -889,12 +890,12 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
#ifdef __GXX_EXPERIMENTAL_CXX0X__
/**
* @brief Construct from a character %array.
* @param str An %array of characters @a zero and @a one.
* @param n The number of characters to use.
* @param zero The character corresponding to the value 0.
* @param one The character corresponding to the value 1.
* @throw std::invalid_argument If a character appears in the string
* which is neither @a zero nor @a one.
* @param __str An %array of characters @a zero and @a one.
* @param __n The number of characters to use.
* @param __zero The character corresponding to the value 0.
* @param __one The character corresponding to the value 1.
* @throw std::invalid_argument If a character appears in the string
* which is neither @a __zero nor @a __one.
*/
template<typename _CharT>
explicit
......@@ -919,7 +920,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
//@{
/**
* @brief Operations on bitsets.
* @param rhs A same-sized bitset.
* @param __rhs A same-sized bitset.
*
* These should be self-explanatory.
*/
......@@ -948,7 +949,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
//@{
/**
* @brief Operations on bitsets.
* @param position The number of places to shift.
* @param __position The number of places to shift.
*
* These should be self-explanatory.
*/
......@@ -1036,8 +1037,8 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
/**
* @brief Sets a given bit to a particular value.
* @param position The index of the bit.
* @param val Either true or false, defaults to true.
* @param __position The index of the bit.
* @param __val Either true or false, defaults to true.
* @throw std::out_of_range If @a pos is bigger the size of the %set.
*/
bitset<_Nb>&
......@@ -1060,7 +1061,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
/**
* @brief Sets a given bit to false.
* @param position The index of the bit.
* @param __position The index of the bit.
* @throw std::out_of_range If @a pos is bigger the size of the %set.
*
* Same as writing @c set(pos,false).
......@@ -1086,7 +1087,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
/**
* @brief Toggles a given bit to its opposite value.
* @param position The index of the bit.
* @param __position The index of the bit.
* @throw std::out_of_range If @a pos is bigger the size of the %set.
*/
bitset<_Nb>&
......@@ -1105,7 +1106,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
//@{
/**
* @brief Array-indexing support.
* @param position Index into the %bitset.
* @param __position Index into the %bitset.
* @return A bool for a <em>const %bitset</em>. For non-const
* bitsets, an instance of the reference proxy class.
* @note These operators do no range checking and throw no exceptions,
......@@ -1271,7 +1272,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
/**
* @brief Tests the value of a bit.
* @param position The index of a bit.
* @param __position The index of a bit.
* @return The value at @a pos.
* @throw std::out_of_range If @a pos is bigger the size of the %set.
*/
......@@ -1333,7 +1334,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
/**
* @brief Finds the index of the next "on" bit after prev.
* @return The index of the next bit set, or size() if not found.
* @param prev Where to start searching.
* @param __prev Where to start searching.
* @ingroup SGIextensions
* @sa _Find_first
*/
......@@ -1381,8 +1382,8 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
//@{
/**
* @brief Global bitwise operations on bitsets.
* @param x A bitset.
* @param y A bitset of the same size as @a x.
* @param __x A bitset.
* @param __y A bitset of the same size as @a __x.
* @return A new bitset.
*
* These should be self-explanatory.
......
......@@ -226,12 +226,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Opens an external file.
* @param s The name of the file.
* @param mode The open mode flags.
* @param __s The name of the file.
* @param __mode The open mode flags.
* @return @c this on success, NULL on failure
*
* If a file is already open, this function immediately fails.
* Otherwise it tries to open the file named @a s using the flags
* Otherwise it tries to open the file named @a __s using the flags
* given in @a mode.
*
* Table 92, adapted here, gives the relation between openmode
......@@ -269,8 +269,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#ifdef __GXX_EXPERIMENTAL_CXX0X__
/**
* @brief Opens an external file.
* @param s The name of the file.
* @param mode The open mode flags.
* @param __s The name of the file.
* @param __mode The open mode flags.
* @return @c this on success, NULL on failure
*/
__filebuf_type*
......@@ -332,12 +332,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Manipulates the buffer.
* @param s Pointer to a buffer area.
* @param n Size of @a s.
* @param __s Pointer to a buffer area.
* @param __n Size of @a __s.
* @return @c this
*
* If no file has been opened, and both @a s and @a n are zero, then
* the stream becomes unbuffered. Otherwise, @c s is used as a
* If no file has been opened, and both @a __s and @a __n are zero, then
* the stream becomes unbuffered. Otherwise, @c __s is used as a
* buffer; see
* http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt11ch25s02.html
* for more.
......@@ -448,10 +448,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Create an input file stream.
* @param s Null terminated string specifying the filename.
* @param mode Open file in specified mode (see std::ios_base).
* @param __s Null terminated string specifying the filename.
* @param __mode Open file in specified mode (see std::ios_base).
*
* @c ios_base::in is automatically included in @a mode.
* @c ios_base::in is automatically included in @a __mode.
*
* Tip: When using std::string to hold the filename, you must use
* .c_str() before passing it to this constructor.
......@@ -467,10 +467,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#ifdef __GXX_EXPERIMENTAL_CXX0X__
/**
* @brief Create an input file stream.
* @param s std::string specifying the filename.
* @param mode Open file in specified mode (see std::ios_base).
* @param __s std::string specifying the filename.
* @param __mode Open file in specified mode (see std::ios_base).
*
* @c ios_base::in is automatically included in @a mode.
* @c ios_base::in is automatically included in @a __mode.
*/
explicit
basic_ifstream(const std::string& __s,
......@@ -518,10 +518,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Opens an external file.
* @param s The name of the file.
* @param mode The open mode flags.
* @param __s The name of the file.
* @param __mode The open mode flags.
*
* Calls @c std::basic_filebuf::open(s,mode|in). If that function
* Calls @c std::basic_filebuf::open(s,__mode|in). If that function
* fails, @c failbit is set in the stream's error state.
*
* Tip: When using std::string to hold the filename, you must use
......@@ -541,10 +541,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#ifdef __GXX_EXPERIMENTAL_CXX0X__
/**
* @brief Opens an external file.
* @param s The name of the file.
* @param mode The open mode flags.
* @param __s The name of the file.
* @param __mode The open mode flags.
*
* Calls @c std::basic_filebuf::open(s,mode|in). If that function
* Calls @c std::basic_filebuf::open(__s,__mode|in). If that function
* fails, @c failbit is set in the stream's error state.
*/
void
......@@ -616,11 +616,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Create an output file stream.
* @param s Null terminated string specifying the filename.
* @param mode Open file in specified mode (see std::ios_base).
* @param __s Null terminated string specifying the filename.
* @param __mode Open file in specified mode (see std::ios_base).
*
* @c ios_base::out|ios_base::trunc is automatically included in
* @a mode.
* @a __mode.
*
* Tip: When using std::string to hold the filename, you must use
* .c_str() before passing it to this constructor.
......@@ -637,11 +637,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#ifdef __GXX_EXPERIMENTAL_CXX0X__
/**
* @brief Create an output file stream.
* @param s std::string specifying the filename.
* @param mode Open file in specified mode (see std::ios_base).
* @param __s std::string specifying the filename.
* @param __mode Open file in specified mode (see std::ios_base).
*
* @c ios_base::out|ios_base::trunc is automatically included in
* @a mode.
* @a __mode.
*/
explicit
basic_ofstream(const std::string& __s,
......@@ -689,10 +689,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Opens an external file.
* @param s The name of the file.
* @param mode The open mode flags.
* @param __s The name of the file.
* @param __mode The open mode flags.
*
* Calls @c std::basic_filebuf::open(s,mode|out|trunc). If that
* Calls @c std::basic_filebuf::open(__s,__mode|out|trunc). If that
* function fails, @c failbit is set in the stream's error state.
*
* Tip: When using std::string to hold the filename, you must use
......@@ -713,8 +713,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#ifdef __GXX_EXPERIMENTAL_CXX0X__
/**
* @brief Opens an external file.
* @param s The name of the file.
* @param mode The open mode flags.
* @param __s The name of the file.
* @param __mode The open mode flags.
*
* Calls @c std::basic_filebuf::open(s,mode|out|trunc). If that
* function fails, @c failbit is set in the stream's error state.
......@@ -791,8 +791,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Create an input/output file stream.
* @param s Null terminated string specifying the filename.
* @param mode Open file in specified mode (see std::ios_base).
* @param __s Null terminated string specifying the filename.
* @param __mode Open file in specified mode (see std::ios_base).
*
* Tip: When using std::string to hold the filename, you must use
* .c_str() before passing it to this constructor.
......@@ -809,8 +809,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#ifdef __GXX_EXPERIMENTAL_CXX0X__
/**
* @brief Create an input/output file stream.
* @param s Null terminated string specifying the filename.
* @param mode Open file in specified mode (see std::ios_base).
* @param __s Null terminated string specifying the filename.
* @param __mode Open file in specified mode (see std::ios_base).
*/
explicit
basic_fstream(const std::string& __s,
......@@ -858,10 +858,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Opens an external file.
* @param s The name of the file.
* @param mode The open mode flags.
* @param __s The name of the file.
* @param __mode The open mode flags.
*
* Calls @c std::basic_filebuf::open(s,mode). If that
* Calls @c std::basic_filebuf::open(__s,__mode). If that
* function fails, @c failbit is set in the stream's error state.
*
* Tip: When using std::string to hold the filename, you must use
......@@ -882,10 +882,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#ifdef __GXX_EXPERIMENTAL_CXX0X__
/**
* @brief Opens an external file.
* @param s The name of the file.
* @param mode The open mode flags.
* @param __s The name of the file.
* @param __mode The open mode flags.
*
* Calls @c std::basic_filebuf::open(s,mode). If that
* Calls @c std::basic_filebuf::open(__s,__mode). If that
* function fails, @c failbit is set in the stream's error state.
*/
void
......
......@@ -1996,19 +1996,19 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type)
/**
* @brief %Function copy constructor.
* @param x A %function object with identical call signature.
* @post @c (bool)*this == (bool)x
* @param __x A %function object with identical call signature.
* @post @c bool(*this) == bool(__x)
*
* The newly-created %function contains a copy of the target of @a
* x (if it has one).
* __x (if it has one).
*/
function(const function& __x);
/**
* @brief %Function move constructor.
* @param x A %function object rvalue with identical call signature.
* @param __x A %function object rvalue with identical call signature.
*
* The newly-created %function contains the target of @a x
* The newly-created %function contains the target of @a __x
* (if it has one).
*/
function(function&& __x) : _Function_base()
......@@ -2021,17 +2021,17 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type)
/**
* @brief Builds a %function that targets a copy of the incoming
* function object.
* @param f A %function object that is callable with parameters of
* @param __f A %function object that is callable with parameters of
* type @c T1, @c T2, ..., @c TN and returns a value convertible
* to @c Res.
*
* The newly-created %function object will target a copy of @a
* f. If @a f is @c reference_wrapper<F>, then this function
* The newly-created %function object will target a copy of
* @a __f. If @a __f is @c reference_wrapper<F>, then this function
* object will contain a reference to the function object @c
* f.get(). If @a f is a NULL function pointer or NULL
* __f.get(). If @a __f is a NULL function pointer or NULL
* pointer-to-member, the newly-created object will be empty.
*
* If @a f is a non-NULL function pointer or an object of type @c
* If @a __f is a non-NULL function pointer or an object of type @c
* reference_wrapper<F>, this function will not throw.
*/
template<typename _Functor>
......@@ -2042,14 +2042,14 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type)
/**
* @brief %Function assignment operator.
* @param x A %function with identical call signature.
* @param __x A %function with identical call signature.
* @post @c (bool)*this == (bool)x
* @returns @c *this
*
* The target of @a x is copied to @c *this. If @a x has no
* The target of @a __x is copied to @c *this. If @a __x has no
* target, then @c *this will be empty.
*
* If @a x targets a function pointer or a reference to a function
* If @a __x targets a function pointer or a reference to a function
* object, then this operation will not throw an %exception.
*/
function&
......@@ -2061,13 +2061,13 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type)
/**
* @brief %Function move-assignment operator.
* @param x A %function rvalue with identical call signature.
* @param __x A %function rvalue with identical call signature.
* @returns @c *this
*
* The target of @a x is moved to @c *this. If @a x has no
* The target of @a __x is moved to @c *this. If @a __x has no
* target, then @c *this will be empty.
*
* If @a x targets a function pointer or a reference to a function
* If @a __x targets a function pointer or a reference to a function
* object, then this operation will not throw an %exception.
*/
function&
......@@ -2098,18 +2098,18 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type)
/**
* @brief %Function assignment to a new target.
* @param f A %function object that is callable with parameters of
* @param __f A %function object that is callable with parameters of
* type @c T1, @c T2, ..., @c TN and returns a value convertible
* to @c Res.
* @return @c *this
*
* This %function object wrapper will target a copy of @a
* f. If @a f is @c reference_wrapper<F>, then this function
* __f. If @a __f is @c reference_wrapper<F>, then this function
* object will contain a reference to the function object @c
* f.get(). If @a f is a NULL function pointer or NULL
* __f.get(). If @a __f is a NULL function pointer or NULL
* pointer-to-member, @c this object will be empty.
*
* If @a f is a non-NULL function pointer or an object of type @c
* If @a __f is a non-NULL function pointer or an object of type @c
* reference_wrapper<F>, this function will not throw.
*/
template<typename _Functor>
......@@ -2133,9 +2133,9 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type)
/**
* @brief Swap the targets of two %function objects.
* @param f A %function with identical call signature.
* @param __x A %function with identical call signature.
*
* Swap the targets of @c this function object and @a f. This
* Swap the targets of @c this function object and @a __f. This
* function will not throw an %exception.
*/
void swap(function& __x)
......
......@@ -56,10 +56,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Manipulator for @c setf.
* @param mask A format flags mask.
* @param __mask A format flags mask.
*
* Sent to a stream object, this manipulator resets the specified flags,
* via @e stream.setf(0,mask).
* via @e stream.setf(0,__mask).
*/
inline _Resetiosflags
resetiosflags(ios_base::fmtflags __mask)
......@@ -86,10 +86,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Manipulator for @c setf.
* @param mask A format flags mask.
* @param __mask A format flags mask.
*
* Sent to a stream object, this manipulator sets the format flags
* to @a mask.
* to @a __mask.
*/
inline _Setiosflags
setiosflags(ios_base::fmtflags __mask)
......@@ -116,11 +116,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Manipulator for @c setf.
* @param base A numeric base.
* @param __base A numeric base.
*
* Sent to a stream object, this manipulator changes the
* @c ios_base::basefield flags to @c oct, @c dec, or @c hex when @a base
* is 8, 10, or 16, accordingly, and to 0 if @a base is any other value.
* is 8, 10, or 16, accordingly, and to 0 if @a __base is any other value.
*/
inline _Setbase
setbase(int __base)
......@@ -154,9 +154,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Manipulator for @c fill.
* @param c The new fill character.
* @param __c The new fill character.
*
* Sent to a stream object, this manipulator calls @c fill(c) for that
* Sent to a stream object, this manipulator calls @c fill(__c) for that
* object.
*/
template<typename _CharT>
......@@ -185,9 +185,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Manipulator for @c precision.
* @param n The new precision.
* @param __n The new precision.
*
* Sent to a stream object, this manipulator calls @c precision(n) for
* Sent to a stream object, this manipulator calls @c precision(__n) for
* that object.
*/
inline _Setprecision
......@@ -215,9 +215,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Manipulator for @c width.
* @param n The new width.
* @param __n The new width.
*
* Sent to a stream object, this manipulator calls @c width(n) for
* Sent to a stream object, this manipulator calls @c width(__n) for
* that object.
*/
inline _Setw
......@@ -247,11 +247,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Extended manipulator for extracting money.
* @param mon Either long double or a specialization of @c basic_string.
* @param intl A bool indicating whether international format
* is to be used.
* @param __mon Either long double or a specialization of @c basic_string.
* @param __intl A bool indicating whether international format
* is to be used.
*
* Sent to a stream object, this manipulator extracts @a mon.
* Sent to a stream object, this manipulator extracts @a __mon.
*/
template<typename _MoneyT>
inline _Get_money<_MoneyT>
......@@ -283,11 +283,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Extended manipulator for inserting money.
* @param mon Either long double or a specialization of @c basic_string.
* @param intl A bool indicating whether international format
* is to be used.
* @param __mon Either long double or a specialization of @c basic_string.
* @param __intl A bool indicating whether international format
* is to be used.
*
* Sent to a stream object, this manipulator inserts @a mon.
* Sent to a stream object, this manipulator inserts @a __mon.
*/
template<typename _MoneyT>
inline _Put_money<_MoneyT>
......
......@@ -157,7 +157,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
//@{
/**
* @brief Basic arithmetic inserters
* @param A variable of builtin type.
* @param __n, __f, __p A variable of builtin type.
* @return @c *this if successful
*
* These functions use the stream's current locale (specifically, the
......@@ -229,21 +229,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Extracting from another streambuf.
* @param sb A pointer to a streambuf
* @param __sb A pointer to a streambuf
*
* This function behaves like one of the basic arithmetic extractors,
* in that it also constructs a sentry object and has the same error
* handling behavior.
*
* If @a sb is NULL, the stream will set failbit in its error state.
* If @a __sb is NULL, the stream will set failbit in its error state.
*
* Characters are extracted from @a sb and inserted into @c *this
* Characters are extracted from @a __sb and inserted into @c *this
* until one of the following occurs:
*
* - the input stream reaches end-of-file,
* - insertion into the output sequence fails (in this case, the
* character that would have been inserted is not extracted), or
* - an exception occurs while getting a character from @a sb, which
* - an exception occurs while getting a character from @a __sb, which
* sets failbit in the error state
*
* If the function inserts no characters, failbit is set.
......@@ -273,7 +273,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
//@{
/**
* @brief Simple insertion.
* @param c The character to insert.
* @param __c The character to insert.
* @return *this
*
* Tries to insert @a c.
......@@ -295,14 +295,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Character string insertion.
* @param s The array to insert.
* @param n Maximum number of characters to insert.
* @param __s The array to insert.
* @param __n Maximum number of characters to insert.
* @return *this
*
* Characters are copied from @a s and inserted into the stream until
* Characters are copied from @a __s and inserted into the stream until
* one of the following happens:
*
* - @a n characters are inserted
* - @a __n characters are inserted
* - inserting into the output sequence fails (in this case, badbit
* will be set in the stream's error state)
*
......@@ -338,7 +338,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Changing the current write position.
* @param pos A file position object.
* @param __pos A file position object.
* @return *this
*
* If @c fail() is not true, calls @c rdbuf()->pubseekpos(pos). If
......@@ -349,8 +349,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Changing the current write position.
* @param off A file offset object.
* @param dir The direction in which to seek.
* @param __off A file offset object.
* @param __dir The direction in which to seek.
* @return *this
*
* If @c fail() is not true, calls @c rdbuf()->pubseekoff(off,dir).
......@@ -385,9 +385,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
public:
/**
* @brief The constructor performs preparatory work.
* @param os The output stream to guard.
* @param __os The output stream to guard.
*
* If the stream state is good (@a os.good() is true), then if the
* If the stream state is good (@a __os.good() is true), then if the
* stream is tied to another output stream, @c is.tie()->flush()
* is called to synchronize the output sequences.
*
......@@ -433,17 +433,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
//@{
/**
* @brief Character inserters
* @param out An output stream.
* @param c A character.
* @param __out An output stream.
* @param __c A character.
* @return out
*
* Behaves like one of the formatted arithmetic inserters described in
* std::basic_ostream. After constructing a sentry object with good
* status, this function inserts a single character and any required
* padding (as determined by [22.2.2.2.2]). @c out.width(0) is then
* padding (as determined by [22.2.2.2.2]). @c __out.width(0) is then
* called.
*
* If @a c is of type @c char and the character type of the stream is not
* If @a __c is of type @c char and the character type of the stream is not
* @c char, the character is widened before insertion.
*/
template<typename _CharT, typename _Traits>
......@@ -477,16 +477,16 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
//@{
/**
* @brief String inserters
* @param out An output stream.
* @param s A character string.
* @param __out An output stream.
* @param __s A character string.
* @return out
* @pre @a s must be a non-NULL pointer
*
* Behaves like one of the formatted arithmetic inserters described in
* std::basic_ostream. After constructing a sentry object with good
* status, this function inserts @c traits::length(s) characters starting
* at @a s, widened if necessary, followed by any required padding (as
* determined by [22.2.2.2.2]). @c out.width(0) is then called.
* status, this function inserts @c traits::length(__s) characters starting
* at @a __s, widened if necessary, followed by any required padding (as
* determined by [22.2.2.2.2]). @c __out.width(0) is then called.
*/
template<typename _CharT, typename _Traits>
inline basic_ostream<_CharT, _Traits>&
......@@ -568,8 +568,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
// [27.7.2.9] Rvalue stream insertion
/**
* @brief Generic inserter for rvalue stream
* @param os An input stream.
* @param x A reference to the object being inserted.
* @param __os An input stream.
* @param __x A reference to the object being inserted.
* @return os
*
* This is just a forwarding function to allow insertion to
......
......@@ -93,72 +93,84 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _OuterAlloc, typename... _InnerAllocs>
class scoped_allocator_adaptor;
template<typename...> struct __inner_type_impl;
template<typename...>
struct __inner_type_impl;
template<typename _Outer>
struct __inner_type_impl<_Outer>
{
typedef scoped_allocator_adaptor<_Outer> __type;
__inner_type_impl() = default;
__inner_type_impl(const __inner_type_impl&) = default;
__inner_type_impl(__inner_type_impl&&) = default;
template<typename _Alloc>
__inner_type_impl(const __inner_type_impl<_Alloc>& __other)
{ }
template<typename _Alloc>
__inner_type_impl(__inner_type_impl<_Alloc>&& __other)
{ }
__type& _M_get(__type* __p) noexcept { return *__p; }
const __type& _M_get(const __type* __p) const noexcept { return *__p; }
tuple<> _M_tie() const noexcept { return tuple<>(); }
bool operator==(const __inner_type_impl&) const noexcept
{ return true; }
};
template<typename _Outer, typename _InnerHead, typename... _InnerTail>
struct __inner_type_impl<_Outer, _InnerHead, _InnerTail...>
{
typedef scoped_allocator_adaptor<_InnerHead, _InnerTail...> __type;
__inner_type_impl() = default;
__inner_type_impl(const __inner_type_impl&) = default;
__inner_type_impl(__inner_type_impl&&) = default;
template<typename... _Allocs>
__inner_type_impl(const __inner_type_impl<_Allocs...>& __other)
: _M_inner(__other._M_inner) { }
template<typename... _Allocs>
__inner_type_impl(__inner_type_impl<_Allocs...>&& __other)
: _M_inner(std::move(__other._M_inner)) { }
template<typename... _Args>
explicit
__inner_type_impl(_Args&&... __args)
: _M_inner(std::forward<_Args>(__args)...) { }
template<typename _Outer>
struct __inner_type_impl<_Outer>
{
typedef scoped_allocator_adaptor<_Outer> __type;
__type& _M_get(void*) noexcept { return _M_inner; }
const __type& _M_get(const void*) const noexcept { return _M_inner; }
__inner_type_impl() = default;
__inner_type_impl(const __inner_type_impl&) = default;
__inner_type_impl(__inner_type_impl&&) = default;
template<typename _Alloc>
__inner_type_impl(const __inner_type_impl<_Alloc>& __other)
{ }
template<typename _Alloc>
__inner_type_impl(__inner_type_impl<_Alloc>&& __other)
{ }
__type&
_M_get(__type* __p) noexcept { return *__p; }
tuple<const _InnerHead&, const _InnerTail&...> _M_tie() const noexcept
{ return _M_inner._M_tie(); }
const __type&
_M_get(const __type* __p) const noexcept { return *__p; }
tuple<>
_M_tie() const noexcept { return tuple<>(); }
bool
operator==(const __inner_type_impl&) const noexcept
{ return true; }
};
bool operator==(const __inner_type_impl& __other) const noexcept
{ return _M_inner == __other._M_inner; }
template<typename _Outer, typename _InnerHead, typename... _InnerTail>
struct __inner_type_impl<_Outer, _InnerHead, _InnerTail...>
{
typedef scoped_allocator_adaptor<_InnerHead, _InnerTail...> __type;
__inner_type_impl() = default;
__inner_type_impl(const __inner_type_impl&) = default;
__inner_type_impl(__inner_type_impl&&) = default;
template<typename... _Allocs>
__inner_type_impl(const __inner_type_impl<_Allocs...>& __other)
: _M_inner(__other._M_inner) { }
template<typename... _Allocs>
__inner_type_impl(__inner_type_impl<_Allocs...>&& __other)
: _M_inner(std::move(__other._M_inner)) { }
private:
template<typename...> friend class __inner_type_impl;
template<typename, typename...> friend class scoped_allocator_adaptor;
template<typename... _Args>
explicit
__inner_type_impl(_Args&&... __args)
: _M_inner(std::forward<_Args>(__args)...) { }
__type _M_inner;
};
__type&
_M_get(void*) noexcept { return _M_inner; }
const __type&
_M_get(const void*) const noexcept { return _M_inner; }
tuple<const _InnerHead&, const _InnerTail&...>
_M_tie() const noexcept
{ return _M_inner._M_tie(); }
bool
operator==(const __inner_type_impl& __other) const noexcept
{ return _M_inner == __other._M_inner; }
private:
template<typename...> friend class __inner_type_impl;
template<typename, typename...> friend class scoped_allocator_adaptor;
__type _M_inner;
};
/// Primary class template.
template<typename _OuterAlloc, typename... _InnerAllocs>
class scoped_allocator_adaptor
: public _OuterAlloc
......@@ -180,7 +192,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Tp, typename... _Args>
void _M_construct(__uses_alloc0, _Tp* __p, _Args&&... __args)
void
_M_construct(__uses_alloc0, _Tp* __p, _Args&&... __args)
{
auto& __outer = __outermost(*this);
typedef typename std::decay<decltype(__outer)>::type __outer_type;
......@@ -192,7 +205,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
typedef __uses_alloc2<typename __inner_type::__type> __uses_alloc2_;
template<typename _Tp, typename... _Args>
void _M_construct(__uses_alloc1_, _Tp* __p, _Args&&... __args)
void
_M_construct(__uses_alloc1_, _Tp* __p, _Args&&... __args)
{
auto& __outer = __outermost(*this);
typedef typename std::decay<decltype(__outer)>::type __outer_type;
......@@ -202,7 +216,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp, typename... _Args>
void _M_construct(__uses_alloc2_, _Tp* __p, _Args&&... __args)
void
_M_construct(__uses_alloc2_, _Tp* __p, _Args&&... __args)
{
auto& __outer = __outermost(*this);
typedef typename std::decay<decltype(__outer)>::type __outer_type;
......
......@@ -85,7 +85,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
// Constructors:
/**
* @brief Starts with an empty string buffer.
* @param mode Whether the buffer can read, or write, or both.
* @param __mode Whether the buffer can read, or write, or both.
*
* The default constructor initializes the parent class using its
* own default ctor.
......@@ -97,8 +97,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Starts with an existing string buffer.
* @param str A string to copy as a starting buffer.
* @param mode Whether the buffer can read, or write, or both.
* @param __str A string to copy as a starting buffer.
* @param __mode Whether the buffer can read, or write, or both.
*
* This constructor initializes the parent class using its
* own default ctor.
......@@ -137,7 +137,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Setting a new buffer.
* @param s The string to use as a new sequence.
* @param __s The string to use as a new sequence.
*
* Deallocates any previous stored sequence, then copies @a s to
* use as a new one.
......@@ -185,12 +185,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Manipulates the buffer.
* @param s Pointer to a buffer area.
* @param n Size of @a s.
* @param __s Pointer to a buffer area.
* @param __n Size of @a __s.
* @return @c this
*
* If no buffer has already been created, and both @a s and @a n are
* non-zero, then @c s is used as a buffer; see
* If no buffer has already been created, and both @a __s and @a __n are
* non-zero, then @c __s is used as a buffer; see
* http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt11ch25s02.html
* for more.
*/
......@@ -285,11 +285,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
// Constructors:
/**
* @brief Default constructor starts with an empty string buffer.
* @param mode Whether the buffer can read, or write, or both.
* @param __mode Whether the buffer can read, or write, or both.
*
* @c ios_base::in is automatically included in @a mode.
* @c ios_base::in is automatically included in @a __mode.
*
* Initializes @c sb using @c mode|in, and passes @c &sb to the base
* Initializes @c sb using @c __mode|in, and passes @c &sb to the base
* class initializer. Does not allocate any buffer.
*
* That's a lie. We initialize the base class with NULL, because the
......@@ -302,8 +302,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Starts with an existing string buffer.
* @param str A string to copy as a starting buffer.
* @param mode Whether the buffer can read, or write, or both.
* @param __str A string to copy as a starting buffer.
* @param __mode Whether the buffer can read, or write, or both.
*
* @c ios_base::in is automatically included in @a mode.
*
......@@ -349,7 +349,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Setting a new buffer.
* @param s The string to use as a new sequence.
* @param __s The string to use as a new sequence.
*
* Calls @c rdbuf()->str(s).
*/
......@@ -395,7 +395,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
// Constructors/destructor:
/**
* @brief Default constructor starts with an empty string buffer.
* @param mode Whether the buffer can read, or write, or both.
* @param __mode Whether the buffer can read, or write, or both.
*
* @c ios_base::out is automatically included in @a mode.
*
......@@ -412,8 +412,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Starts with an existing string buffer.
* @param str A string to copy as a starting buffer.
* @param mode Whether the buffer can read, or write, or both.
* @param __str A string to copy as a starting buffer.
* @param __mode Whether the buffer can read, or write, or both.
*
* @c ios_base::out is automatically included in @a mode.
*
......@@ -459,7 +459,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Setting a new buffer.
* @param s The string to use as a new sequence.
* @param __s The string to use as a new sequence.
*
* Calls @c rdbuf()->str(s).
*/
......@@ -505,10 +505,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
// Constructors/destructors
/**
* @brief Default constructor starts with an empty string buffer.
* @param mode Whether the buffer can read, or write, or both.
* @param __m Whether the buffer can read, or write, or both.
*
* Initializes @c sb using @c mode, and passes @c &sb to the base
* class initializer. Does not allocate any buffer.
* Initializes @c sb using the mode from @c __m, and passes @c
* &sb to the base class initializer. Does not allocate any
* buffer.
*
* That's a lie. We initialize the base class with NULL, because the
* string class does its own memory management.
......@@ -520,10 +521,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Starts with an existing string buffer.
* @param str A string to copy as a starting buffer.
* @param mode Whether the buffer can read, or write, or both.
* @param __str A string to copy as a starting buffer.
* @param __m Whether the buffer can read, or write, or both.
*
* Initializes @c sb using @a str and @c mode, and passes @c &sb
* Initializes @c sb using @a __str and @c __m, and passes @c &sb
* to the base class initializer.
*
* That's a lie. We initialize the base class with NULL, because the
......@@ -565,7 +566,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Setting a new buffer.
* @param s The string to use as a new sequence.
* @param __s The string to use as a new sequence.
*
* Calls @c rdbuf()->str(s).
*/
......
......@@ -80,7 +80,7 @@ namespace std
/**
* @brief Return an iterator pointing to the first element of
* the initilizer_list.
* @param il Initializer list.
* @param __ils Initializer list.
*/
template<class _Tp>
constexpr const _Tp*
......@@ -90,7 +90,7 @@ namespace std
/**
* @brief Return an iterator pointing to one past the last element
* of the initilizer_list.
* @param il Initializer list.
* @param __ils Initializer list.
*/
template<class _Tp>
constexpr const _Tp*
......
......@@ -18,7 +18,7 @@
// <http://www.gnu.org/licenses/>.
// { dg-do compile }
// { dg-error "no matching" "" { target *-*-* } 1497 }
// { dg-error "no matching" "" { target *-*-* } 1498 }
#include <list>
......
......@@ -18,7 +18,7 @@
// <http://www.gnu.org/licenses/>.
// { dg-do compile }
// { dg-error "no matching" "" { target *-*-* } 1453 }
// { dg-error "no matching" "" { target *-*-* } 1454 }
#include <list>
......
......@@ -18,7 +18,7 @@
// <http://www.gnu.org/licenses/>.
// { dg-do compile }
// { dg-error "no matching" "" { target *-*-* } 1453 }
// { dg-error "no matching" "" { target *-*-* } 1454 }
#include <list>
#include <utility>
......
......@@ -18,7 +18,7 @@
// <http://www.gnu.org/licenses/>.
// { dg-do compile }
// { dg-error "no matching" "" { target *-*-* } 1453 }
// { dg-error "no matching" "" { target *-*-* } 1454 }
#include <list>
......
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