diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2011-08-07 07:27:06 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2011-08-07 07:27:06 +0000 |
| commit | 93c66bc68a2554cbb2ba11f90944314af378d16b (patch) | |
| tree | 45eb6d5a21849a3b8684ed93cfe2f669d22f0ca5 /libstdc++-v3/include/std | |
| parent | 77d2c8b34ff4b7a347251879180bfb282225636a (diff) | |
| download | gcc-93c66bc68a2554cbb2ba11f90944314af378d16b.zip gcc-93c66bc68a2554cbb2ba11f90944314af378d16b.tar.gz gcc-93c66bc68a2554cbb2ba11f90944314af378d16b.tar.bz2 | |
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
Diffstat (limited to 'libstdc++-v3/include/std')
| -rw-r--r-- | libstdc++-v3/include/std/bitset | 49 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/fstream | 84 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/functional | 44 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/iomanip | 40 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/istream | 128 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/ostream | 52 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/scoped_allocator | 139 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/sstream | 51 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/streambuf | 108 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/valarray | 110 |
10 files changed, 420 insertions, 385 deletions
diff --git a/libstdc++-v3/include/std/bitset b/libstdc++-v3/include/std/bitset index f880e72..5829726 100644 --- a/libstdc++-v3/include/std/bitset +++ b/libstdc++-v3/include/std/bitset @@ -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. diff --git a/libstdc++-v3/include/std/fstream b/libstdc++-v3/include/std/fstream index 8ad6e5c..245404e 100644 --- a/libstdc++-v3/include/std/fstream +++ b/libstdc++-v3/include/std/fstream @@ -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 diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std/functional index df3f9ce..9296d75 100644 --- a/libstdc++-v3/include/std/functional +++ b/libstdc++-v3/include/std/functional @@ -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) diff --git a/libstdc++-v3/include/std/iomanip b/libstdc++-v3/include/std/iomanip index 91f90e5..ea2c44a 100644 --- a/libstdc++-v3/include/std/iomanip +++ b/libstdc++-v3/include/std/iomanip @@ -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> diff --git a/libstdc++-v3/include/std/istream b/libstdc++-v3/include/std/istream index fb39392..19bc42b 100644 --- a/libstdc++-v3/include/std/istream +++ b/libstdc++-v3/include/std/istream @@ -159,7 +159,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION //@{ /** * @brief Basic arithmetic extractors - * @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 @@ -219,13 +219,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @brief Extracting into 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 this stream and inserted into the * @a sb streambuf until one of the following occurs: @@ -284,10 +284,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @brief Simple extraction. - * @param c The character in which to store data. + * @param __c The character in which to store data. * @return *this * - * Tries to extract a character and store it in @a c. If none are + * Tries to extract a character and store it in @a __c. If none are * available, sets failbit and returns traits::eof(). * * @note This function is not overloaded on signed char and @@ -298,17 +298,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @brief Simple multiple-character extraction. - * @param s Pointer to an array. - * @param n Maximum number of characters to store in @a s. - * @param delim A "stop" character. + * @param __s Pointer to an array. + * @param __n Maximum number of characters to store in @a __s. + * @param __delim A "stop" character. * @return *this * - * Characters are extracted and stored into @a s until one of the + * Characters are extracted and stored into @a __s until one of the * following happens: * - * - @c n-1 characters are stored + * - @c __n-1 characters are stored * - the input sequence reaches EOF - * - the next character equals @a delim, in which case the character + * - the next character equals @a __delim, in which case the character * is not extracted * * If no characters are stored, failbit is set in the stream's error @@ -325,11 +325,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @brief Simple multiple-character extraction. - * @param s Pointer to an array. - * @param n Maximum number of characters to store in @a s. + * @param __s Pointer to an array. + * @param __n Maximum number of characters to store in @a s. * @return *this * - * Returns @c get(s,n,widen('\\n')). + * Returns @c get(__s,__n,widen('\\n')). */ __istream_type& get(char_type* __s, streamsize __n) @@ -337,17 +337,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @brief Extraction into another streambuf. - * @param sb A streambuf in which to store data. - * @param delim A "stop" character. + * @param __sb A streambuf in which to store data. + * @param __delim A "stop" character. * @return *this * - * Characters are extracted and inserted into @a sb until one of the + * Characters are extracted and inserted into @a __sb until one of the * following happens: * * - the input sequence reaches EOF * - insertion into the output buffer fails (in this case, the * character that would have been inserted is not extracted) - * - the next character equals @a delim (in this case, the character + * - the next character equals @a __delim (in this case, the character * is not extracted) * - an exception occurs (and in this case is caught) * @@ -359,10 +359,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @brief Extraction into another streambuf. - * @param sb A streambuf in which to store data. + * @param __sb A streambuf in which to store data. * @return *this * - * Returns @c get(sb,widen('\\n')). + * Returns @c get(__sb,widen('\\n')). */ __istream_type& get(__streambuf_type& __sb) @@ -370,21 +370,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @brief String extraction. - * @param s A character array in which to store the data. - * @param n Maximum number of characters to extract. - * @param delim A "stop" character. + * @param __s A character array in which to store the data. + * @param __n Maximum number of characters to extract. + * @param __delim A "stop" character. * @return *this * - * Extracts and stores characters into @a s until one of the + * Extracts and stores characters into @a __s until one of the * following happens. Note that these criteria are required to be * tested in the order listed here, to allow an input line to exactly - * fill the @a s array without setting failbit. + * fill the @a __s array without setting failbit. * * -# the input sequence reaches end-of-file, in which case eofbit * is set in the stream error state - * -# the next character equals @c delim, in which case the character + * -# the next character equals @c __delim, in which case the character * is extracted (and therefore counted in @c gcount()) but not stored - * -# @c n-1 characters are stored, in which case failbit is set + * -# @c __n-1 characters are stored, in which case failbit is set * in the stream error state * * If no characters are extracted, failbit is set. (An empty line of @@ -398,11 +398,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @brief String extraction. - * @param s A character array in which to store the data. - * @param n Maximum number of characters to extract. + * @param __s A character array in which to store the data. + * @param __n Maximum number of characters to extract. * @return *this * - * Returns @c getline(s,n,widen('\\n')). + * Returns @c getline(__s,__n,widen('\\n')). */ __istream_type& getline(char_type* __s, streamsize __n) @@ -410,18 +410,18 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @brief Discarding characters - * @param n Number of characters to discard. - * @param delim A "stop" character. + * @param __n Number of characters to discard. + * @param __delim A "stop" character. * @return *this * * Extracts characters and throws them away until one of the * following happens: - * - if @a n @c != @c std::numeric_limits<int>::max(), @a n + * - if @a __n @c != @c std::numeric_limits<int>::max(), @a __n * characters are extracted * - the input sequence reaches end-of-file - * - the next character equals @a delim (in this case, the character + * - the next character equals @a __delim (in this case, the character * is extracted); note that this condition will never occur if - * @a delim equals @c traits::eof(). + * @a __delim equals @c traits::eof(). * * NB: Provide three overloads, instead of the single function * (with defaults) mandated by the Standard: this leads to a @@ -429,14 +429,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * the Standard. */ __istream_type& - ignore(); + ignore(streamsize __n, int_type __delim); __istream_type& ignore(streamsize __n); __istream_type& - ignore(streamsize __n, int_type __delim); - + ignore(); + /** * @brief Looking ahead in the stream * @return The next character, or eof(). @@ -450,13 +450,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @brief Extraction without delimiters. - * @param s A character array. - * @param n Maximum number of characters to store. + * @param __s A character array. + * @param __n Maximum number of characters to store. * @return *this * * If the stream state is @c good(), extracts characters and stores - * them into @a s until one of the following happens: - * - @a n characters are stored + * them into @a __s until one of the following happens: + * - @a __n characters are stored * - the input sequence reaches end-of-file, in which case the error * state is set to @c failbit|eofbit. * @@ -468,11 +468,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @brief Extraction until the buffer is exhausted, but no more. - * @param s A character array. - * @param n Maximum number of characters to store. + * @param __s A character array. + * @param __n Maximum number of characters to store. * @return The number of characters extracted. * - * Extracts characters and stores them into @a s depending on the + * Extracts characters and stores them into @a __s depending on the * number of characters remaining in the streambuf's buffer, * @c rdbuf()->in_avail(), called @c A here: * - if @c A @c == @c -1, sets eofbit and extracts no characters @@ -487,7 +487,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @brief Unextracting a single character. - * @param c The character to push back into the input stream. + * @param __c The character to push back into the input stream. * @return *this * * If @c rdbuf() is not null, calls @c rdbuf()->sputbackc(c). @@ -553,10 +553,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @brief Changing the current read 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 + * If @c fail() is not true, calls @c rdbuf()->pubseekpos(__pos). If * that function fails, sets failbit. * * @note This function first clears eofbit. It does not count the @@ -568,11 +568,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @brief Changing the current read 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). + * If @c fail() is not true, calls @c rdbuf()->pubseekoff(__off,__dir). * If that function fails, sets failbit. * * @note This function first clears eofbit. It does not count the @@ -650,10 +650,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @brief The constructor performs all the work. - * @param is The input stream to guard. - * @param noskipws Whether to consume whitespace or not. + * @param __is The input stream to guard. + * @param __noskipws Whether to consume whitespace or not. * - * If the stream state is good (@a is.good() is true), then the + * If the stream state is good (@a __is.good() is true), then the * following actions are performed, otherwise the sentry state * is false (<em>not okay</em>) and failbit is set in the * stream state. @@ -662,7 +662,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * * -# if the stream is tied to an output stream, @c is.tie()->flush() * is called to synchronize the output sequence - * -# if @a noskipws is false, and @c ios_base::skipws is set in + * -# if @a __noskipws is false, and @c ios_base::skipws is set in * @c is.flags(), the sentry extracts and discards whitespace * characters from the stream. The currently imbued locale is * used to determine whether each character is whitespace. @@ -691,14 +691,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION //@{ /** * @brief Character extractors - * @param in An input stream. - * @param c A character reference. + * @param __in An input stream. + * @param __c A character reference. * @return in * * Behaves like one of the formatted arithmetic extractors described in * std::basic_istream. After constructing a sentry object with good * status, this function extracts a character (if one is available) and - * stores it in @a c. Otherwise, sets failbit in the input stream. + * stores it in @a __c. Otherwise, sets failbit in the input stream. */ template<typename _CharT, typename _Traits> basic_istream<_CharT, _Traits>& @@ -718,14 +718,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION //@{ /** * @brief Character string extractors - * @param in An input stream. - * @param s A pointer to a character array. - * @return in + * @param __in An input stream. + * @param __s A pointer to a character array. + * @return __in * * Behaves like one of the formatted arithmetic extractors described in * std::basic_istream. After constructing a sentry object with good * status, this function extracts up to @c n characters and stores them - * into the array starting at @a s. @c n is defined as: + * into the array starting at @a __s. @c n is defined as: * * - if @c width() is greater than zero, @c n is width() otherwise * - @c n is <em>the number of elements of the largest array of * @@ -839,8 +839,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // [27.7.1.6] Rvalue stream extraction /** * @brief Generic extractor for rvalue stream - * @param is An input stream. - * @param x A reference to the extraction target. + * @param __is An input stream. + * @param __x A reference to the extraction target. * @return is * * This is just a forwarding function to allow extraction from diff --git a/libstdc++-v3/include/std/ostream b/libstdc++-v3/include/std/ostream index 3004d4b..f1f948f 100644 --- a/libstdc++-v3/include/std/ostream +++ b/libstdc++-v3/include/std/ostream @@ -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 diff --git a/libstdc++-v3/include/std/scoped_allocator b/libstdc++-v3/include/std/scoped_allocator index bde996c..bebbbd2 100644 --- a/libstdc++-v3/include/std/scoped_allocator +++ b/libstdc++-v3/include/std/scoped_allocator @@ -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; diff --git a/libstdc++-v3/include/std/sstream b/libstdc++-v3/include/std/sstream index bf2862a..d9889d7 100644 --- a/libstdc++-v3/include/std/sstream +++ b/libstdc++-v3/include/std/sstream @@ -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). */ diff --git a/libstdc++-v3/include/std/streambuf b/libstdc++-v3/include/std/streambuf index b46efec..82a67da 100644 --- a/libstdc++-v3/include/std/streambuf +++ b/libstdc++-v3/include/std/streambuf @@ -198,13 +198,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // [27.5.2.2.1] locales /** * @brief Entry point for imbue(). - * @param loc The new locale. + * @param __loc The new locale. * @return The previous locale. * - * Calls the derived imbue(loc). + * Calls the derived imbue(__loc). */ locale - pubimbue(const locale &__loc) + pubimbue(const locale& __loc) { locale __tmp(this->getloc()); this->imbue(__loc); @@ -237,16 +237,34 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION pubsetbuf(char_type* __s, streamsize __n) { return this->setbuf(__s, __n); } + /** + * @brief Alters the stream position. + * @param __off Offset. + * @param __way Value for ios_base::seekdir. + * @param __mode Value for ios_base::openmode. + * + * Calls virtual seekoff function. + */ pos_type pubseekoff(off_type __off, ios_base::seekdir __way, ios_base::openmode __mode = ios_base::in | ios_base::out) { return this->seekoff(__off, __way, __mode); } + /** + * @brief Alters the stream position. + * @param __sp Position + * @param __mode Value for ios_base::openmode. + * + * Calls virtual seekpos function. + */ pos_type pubseekpos(pos_type __sp, ios_base::openmode __mode = ios_base::in | ios_base::out) { return this->seekpos(__sp, __mode); } + /** + * @brief Calls virtual sync function. + */ int pubsync() { return this->sync(); } //@} @@ -327,11 +345,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @brief Entry point for xsgetn. - * @param s A buffer area. - * @param n A count. + * @param __s A buffer area. + * @param __n A count. * - * Returns xsgetn(s,n). The effect is to fill @a s[0] through - * @a s[n-1] with characters from the input sequence, if possible. + * Returns xsgetn(__s,__n). The effect is to fill @a __s[0] through + * @a __s[__n-1] with characters from the input sequence, if possible. */ streamsize sgetn(char_type* __s, streamsize __n) @@ -340,13 +358,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // [27.5.2.2.4] putback /** * @brief Pushing characters back into the input stream. - * @param c The character to push back. + * @param __c The character to push back. * @return The previous character, if possible. * - * Similar to sungetc(), but @a c is pushed onto the stream + * Similar to sungetc(), but @a __c is pushed onto the stream * instead of <em>the previous character.</em> If successful, * the next character fetched from the input stream will be @a - * c. + * __c. */ int_type sputbackc(char_type __c) @@ -390,15 +408,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // [27.5.2.2.5] put area /** * @brief Entry point for all single-character output functions. - * @param c A character to output. - * @return @a c, if possible. + * @param __c A character to output. + * @return @a __c, if possible. * * One of two public output functions. * * If a write position is available for the output sequence (i.e., - * the buffer is not full), stores @a c in that position, increments - * the position, and returns @c traits::to_int_type(c). If a write - * position is not available, returns @c overflow(c). + * the buffer is not full), stores @a __c in that position, increments + * the position, and returns @c traits::to_int_type(__c). If a write + * position is not available, returns @c overflow(__c). */ int_type sputc(char_type __c) @@ -417,14 +435,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @brief Entry point for all single-character output functions. - * @param s A buffer read area. - * @param n A count. + * @param __s A buffer read area. + * @param __n A count. * * One of two public output functions. * * - * Returns xsputn(s,n). The effect is to write @a s[0] through - * @a s[n-1] to the output sequence, if possible. + * Returns xsputn(__s,__n). The effect is to write @a __s[0] through + * @a __s[__n-1] to the output sequence, if possible. */ streamsize sputn(const char_type* __s, streamsize __n) @@ -470,7 +488,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @brief Moving the read position. - * @param n The delta by which to move. + * @param __n The delta by which to move. * * This just advances the read position without returning any data. */ @@ -479,11 +497,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @brief Setting the three read area pointers. - * @param gbeg A pointer. - * @param gnext A pointer. - * @param gend A pointer. - * @post @a gbeg == @c eback(), @a gnext == @c gptr(), and - * @a gend == @c egptr() + * @param __gbeg A pointer. + * @param __gnext A pointer. + * @param __gend A pointer. + * @post @a __gbeg == @c eback(), @a __gnext == @c gptr(), and + * @a __gend == @c egptr() */ void setg(char_type* __gbeg, char_type* __gnext, char_type* __gend) @@ -517,7 +535,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @brief Moving the write position. - * @param n The delta by which to move. + * @param __n The delta by which to move. * * This just advances the write position without returning any data. */ @@ -526,10 +544,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @brief Setting the three write area pointers. - * @param pbeg A pointer. - * @param pend A pointer. - * @post @a pbeg == @c pbase(), @a pbeg == @c pptr(), and - * @a pend == @c epptr() + * @param __pbeg A pointer. + * @param __pend A pointer. + * @post @a __pbeg == @c pbase(), @a __pbeg == @c pptr(), and + * @a __pend == @c epptr() */ void setp(char_type* __pbeg, char_type* __pend) @@ -542,7 +560,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // [27.5.2.4.1] locales /** * @brief Changes translations. - * @param loc A new locale. + * @param __loc A new locale. * * Translations done during I/O which depend on the current * locale are changed by this call. The standard adds, @@ -553,7 +571,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * @note Base class version does nothing. */ virtual void - imbue(const locale&) + imbue(const locale& __loc) { } // [27.5.2.4.2] buffer management and positioning @@ -630,12 +648,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @brief Multiple character extraction. - * @param s A buffer area. - * @param n Maximum number of characters to assign. + * @param __s A buffer area. + * @param __n Maximum number of characters to assign. * @return The number of characters assigned. * - * Fills @a s[0] through @a s[n-1] with characters from the input - * sequence, as if by @c sbumpc(). Stops when either @a n characters + * Fills @a __s[0] through @a __s[__n-1] with characters from the input + * sequence, as if by @c sbumpc(). Stops when either @a __n characters * have been copied, or when @c traits::eof() would be copied. * * It is expected that derived classes provide a more efficient @@ -693,7 +711,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // [27.5.2.4.4] putback /** * @brief Tries to back up the input sequence. - * @param c The character to be inserted back into the sequence. + * @param __c The character to be inserted back into the sequence. * @return eof() on failure, <em>some other value</em> on success * @post The constraints of @c gptr(), @c eback(), and @c pptr() * are the same as for @c underflow(). @@ -701,17 +719,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * @note Base class version does nothing, returns eof(). */ virtual int_type - pbackfail(int_type /* __c */ = traits_type::eof()) + pbackfail(int_type __c = traits_type::eof()) { return traits_type::eof(); } // Put area: /** * @brief Multiple character insertion. - * @param s A buffer area. - * @param n Maximum number of characters to write. + * @param __s A buffer area. + * @param __n Maximum number of characters to write. * @return The number of characters written. * - * Writes @a s[0] through @a s[n-1] to the output sequence, as if + * Writes @a __s[0] through @a __s[__n-1] to the output sequence, as if * by @c sputc(). Stops when either @a n characters have been * copied, or when @c sputc() would return @c traits::eof(). * @@ -724,9 +742,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @brief Consumes data from the buffer; writes to the * controlled sequence. - * @param c An additional character to consume. + * @param __c An additional character to consume. * @return eof() to indicate failure, something else (usually - * @a c, or not_eof()) + * @a __c, or not_eof()) * * Informally, this function is called when the output buffer * is full (or does not exist, as buffering need not actually @@ -734,7 +752,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * <em>some effect</em> on the controlled sequence. * (Typically, the buffer is written out to the sequence * verbatim.) In either case, the character @a c is also - * written out, if @a c is not @c eof(). + * written out, if @a __c is not @c eof(). * * For a formal definition of this function, see a good text * such as Langer & Kreft, or [27.5.2.4.5]/3-7. @@ -745,7 +763,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * @note Base class version does nothing, returns eof(). */ virtual int_type - overflow(int_type /* __c */ = traits_type::eof()) + overflow(int_type __c = traits_type::eof()) { return traits_type::eof(); } #if _GLIBCXX_USE_DEPRECATED diff --git a/libstdc++-v3/include/std/valarray b/libstdc++-v3/include/std/valarray index e66333e..3b155c5 100644 --- a/libstdc++-v3/include/std/valarray +++ b/libstdc++-v3/include/std/valarray @@ -110,7 +110,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * one-dimensional array from which different multidimensional subsets can * be accessed and modified. * - * @param Tp Type of object in the array. + * @tparam _Tp Type of object in the array. */ template<class _Tp> class valarray @@ -173,9 +173,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * * Assign elements of array to values in @a v. * - * @param v Valarray to get values from. + * @param __v Valarray to get values from. */ - valarray<_Tp>& operator=(const valarray<_Tp>&); + valarray<_Tp>& operator=(const valarray<_Tp>& __v); #ifdef __GXX_EXPERIMENTAL_CXX0X__ /** @@ -183,9 +183,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * * Move assign elements of array to values in @a v. * - * @param v Valarray to get values from. + * @param __v Valarray to get values from. */ - valarray<_Tp>& operator=(valarray<_Tp>&&) noexcept; + valarray<_Tp>& operator=(valarray<_Tp>&& __v) noexcept; #endif /** @@ -193,9 +193,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * * Assign all elements of array to @a t. * - * @param t Value for elements. + * @param __t Value for elements. */ - valarray<_Tp>& operator=(const _Tp&); + valarray<_Tp>& operator=(const _Tp& __t); /** * @brief Assign elements to an array subset. @@ -203,9 +203,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * Assign elements of array to values in @a sa. Results are undefined * if @a sa does not have the same size as this array. * - * @param sa Array slice to get values from. + * @param __sa Array slice to get values from. */ - valarray<_Tp>& operator=(const slice_array<_Tp>&); + valarray<_Tp>& operator=(const slice_array<_Tp>& __sa); /** * @brief Assign elements to an array subset. @@ -213,9 +213,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * Assign elements of array to values in @a ga. Results are undefined * if @a ga does not have the same size as this array. * - * @param ga Array slice to get values from. + * @param __ga Array slice to get values from. */ - valarray<_Tp>& operator=(const gslice_array<_Tp>&); + valarray<_Tp>& operator=(const gslice_array<_Tp>& __ga); /** * @brief Assign elements to an array subset. @@ -223,9 +223,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * Assign elements of array to values in @a ma. Results are undefined * if @a ma does not have the same size as this array. * - * @param ma Array slice to get values from. + * @param __ma Array slice to get values from. */ - valarray<_Tp>& operator=(const mask_array<_Tp>&); + valarray<_Tp>& operator=(const mask_array<_Tp>& __ma); /** * @brief Assign elements to an array subset. @@ -233,20 +233,20 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * Assign elements of array to values in @a ia. Results are undefined * if @a ia does not have the same size as this array. * - * @param ia Array slice to get values from. + * @param __ia Array slice to get values from. */ - valarray<_Tp>& operator=(const indirect_array<_Tp>&); + valarray<_Tp>& operator=(const indirect_array<_Tp>& __ia); #ifdef __GXX_EXPERIMENTAL_CXX0X__ /** * @brief Assign elements to an initializer_list. * - * Assign elements of array to values in @a l. Results are undefined - * if @a l does not have the same size as this array. + * Assign elements of array to values in @a __l. Results are undefined + * if @a __l does not have the same size as this array. * - * @param l initializer_list to get values from. + * @param __l initializer_list to get values from. */ - valarray& operator=(initializer_list<_Tp>); + valarray& operator=(initializer_list<_Tp> __l); #endif template<class _Dom> valarray<_Tp>& @@ -256,10 +256,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /** * Return a reference to the i'th array element. * - * @param i Index of element to return. + * @param __i Index of element to return. * @return Reference to the i'th element. */ - _Tp& operator[](size_t); + _Tp& operator[](size_t __i); // _GLIBCXX_RESOLVE_LIB_DEFECTS // 389. Const overload of valarray::operator[] returns by value. @@ -273,10 +273,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * indicated by the slice argument. The new valarray has the same size * as the input slice. @see slice. * - * @param s The source slice. - * @return New valarray containing elements in @a s. + * @param __s The source slice. + * @return New valarray containing elements in @a __s. */ - _Expr<_SClos<_ValArray, _Tp>, _Tp> operator[](slice) const; + _Expr<_SClos<_ValArray, _Tp>, _Tp> operator[](slice __s) const; /** * @brief Return a reference to an array subset. @@ -285,10 +285,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * indicated by the slice argument. The new valarray has the same size * as the input slice. @see slice. * - * @param s The source slice. - * @return New valarray containing elements in @a s. + * @param __s The source slice. + * @return New valarray containing elements in @a __s. */ - slice_array<_Tp> operator[](slice); + slice_array<_Tp> operator[](slice __s); /** * @brief Return an array subset. @@ -296,10 +296,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * Returns a slice_array referencing the elements of the array * indicated by the slice argument. @see gslice. * - * @param s The source slice. - * @return Slice_array referencing elements indicated by @a s. + * @param __s The source slice. + * @return Slice_array referencing elements indicated by @a __s. */ - _Expr<_GClos<_ValArray, _Tp>, _Tp> operator[](const gslice&) const; + _Expr<_GClos<_ValArray, _Tp>, _Tp> operator[](const gslice& __s) const; /** * @brief Return a reference to an array subset. @@ -308,10 +308,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * indicated by the gslice argument. The new valarray has * the same size as the input gslice. @see gslice. * - * @param s The source gslice. - * @return New valarray containing elements in @a s. + * @param __s The source gslice. + * @return New valarray containing elements in @a __s. */ - gslice_array<_Tp> operator[](const gslice&); + gslice_array<_Tp> operator[](const gslice& __s); /** * @brief Return an array subset. @@ -322,10 +322,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * the new valarray. Each element of the array is added to the return * valarray if the corresponding element of the argument is true. * - * @param m The valarray bitmask. - * @return New valarray containing elements indicated by @a m. + * @param __m The valarray bitmask. + * @return New valarray containing elements indicated by @a __m. */ - valarray<_Tp> operator[](const valarray<bool>&) const; + valarray<_Tp> operator[](const valarray<bool>& __m) const; /** * @brief Return a reference to an array subset. @@ -336,10 +336,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * subset. Elements of the array are part of the subset if the * corresponding element of the argument is true. * - * @param m The valarray bitmask. - * @return New valarray containing elements indicated by @a m. + * @param __m The valarray bitmask. + * @return New valarray containing elements indicated by @a __m. */ - mask_array<_Tp> operator[](const valarray<bool>&); + mask_array<_Tp> operator[](const valarray<bool>& __m); /** * @brief Return an array subset. @@ -349,11 +349,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * interpreted as the indices of elements of this valarray to copy to * the return valarray. * - * @param i The valarray element index list. - * @return New valarray containing elements in @a s. + * @param __i The valarray element index list. + * @return New valarray containing elements in @a __s. */ _Expr<_IClos<_ValArray, _Tp>, _Tp> - operator[](const valarray<size_t>&) const; + operator[](const valarray<size_t>& __i) const; /** * @brief Return a reference to an array subset. @@ -364,10 +364,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * in the subset. The returned indirect_array refers to these * elements. * - * @param i The valarray element index list. - * @return Indirect_array referencing elements in @a i. + * @param __i The valarray element index list. + * @return Indirect_array referencing elements in @a __i. */ - indirect_array<_Tp> operator[](const valarray<size_t>&); + indirect_array<_Tp> operator[](const valarray<size_t>& __i); // _lib.valarray.unary_ unary operators: /// Return a new valarray by applying unary + to each element. @@ -499,10 +499,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * Positive arguments shift toward index 0, discarding elements [0, n). * Negative arguments discard elements from the top of the array. * - * @param n Number of element positions to shift. + * @param __n Number of element positions to shift. * @return New valarray with elements in shifted positions. */ - valarray<_Tp> shift (int) const; + valarray<_Tp> shift (int __n) const; /** * @brief Return a rotated array. @@ -516,10 +516,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * Positive arguments shift toward index 0, wrapping around the top. * Negative arguments shift towards the top, wrapping around to 0. * - * @param n Number of element positions to rotate. + * @param __n Number of element positions to rotate. * @return New valarray with elements in shifted positions. */ - valarray<_Tp> cshift(int) const; + valarray<_Tp> cshift(int __n) const; /** * @brief Apply a function to the array. @@ -551,8 +551,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * Resize this array to @a size and set all elements to @a c. All * references and iterators are invalidated. * - * @param size New array size. - * @param c New value for all elements. + * @param __size New array size. + * @param __c New value for all elements. */ void resize(size_t __size, _Tp __c = _Tp()); @@ -1176,7 +1176,7 @@ _DEFINE_BINARY_OPERATOR(>=, __greater_equal) /** * @brief Return an iterator pointing to the first element of * the valarray. - * @param va valarray. + * @param __va valarray. */ template<class _Tp> inline _Tp* @@ -1186,7 +1186,7 @@ _DEFINE_BINARY_OPERATOR(>=, __greater_equal) /** * @brief Return an iterator pointing to the first element of * the const valarray. - * @param va valarray. + * @param __va valarray. */ template<class _Tp> inline const _Tp* @@ -1196,7 +1196,7 @@ _DEFINE_BINARY_OPERATOR(>=, __greater_equal) /** * @brief Return an iterator pointing to one past the last element of * the valarray. - * @param va valarray. + * @param __va valarray. */ template<class _Tp> inline _Tp* @@ -1206,7 +1206,7 @@ _DEFINE_BINARY_OPERATOR(>=, __greater_equal) /** * @brief Return an iterator pointing to one past the last element of * the const valarray. - * @param va valarray. + * @param __va valarray. */ template<class _Tp> inline const _Tp* |