diff options
110 files changed, 1602 insertions, 1031 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 984f1503909..dbd4a0aa494 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,145 @@ +2009-02-20 Benjamin Kosnik <bkoz@redhat.com> + + * doc/doxygen/user.cfg.in: Tweaks. + * doc/doxygen/doxygroups.cc: Prefer markup that can be elsewhere, + be elsewhere. + + * include/tr1_impl/unordered_map: Just use most specialized + container module. + * include/tr1_impl/unordered_set: Same. + * include/tr1_impl/array: Same. + * include/bits/stl_list.h: Same. + * include/bits/stl_map.h: Same. + * include/bits/stl_queue.h: Same. + * include/bits/stl_set.h: Same. + * include/bits/stl_stack.h: Same. + * include/bits/forward_list.h: Same. + * include/bits/basic_string.h: Same. + * include/bits/stl_multimap.h: Same. + * include/bits/stl_vector.h: Same. + * include/bits/stl_deque.h: Same. + * include/bits/stl_multiset.h: Same. + * include/bits/stl_bvector.h: Same. + + * include/backward/binders.h: Change binder module to binders. + + * include/std/complex: Add complex_numers module. + * include/tr1_impl/complex: Same. + + * include/std/valarray: Add numeric_arrays module. + * include/bits/gslice_array.h: Same. + * include/bits/gslice.h: Same. + * include/bits/mask_array.h: Same. + * include/bits/slice_array.h: Same. + * include/bits/indirect_array.h: Same. + + * include/bits/allocator.h: Add allocators module. + * include/ext/throw_allocator.h + * include/ext/pool_allocator.h + * include/ext/bitmap_allocator.h + * include/ext/new_allocator.h + * include/ext/malloc_allocator.h + * include/ext/array_allocator.h + * include/ext/mt_allocator.h + * include/ext/debug_allocator.h + * include/ext/extptr_allocator.h + + * include/tr1_impl/functional: Move namespace markup here. + * include/tr1_impl/regex: Same. + + * include/tr1_impl/type_traits: Add metaprogramming module. + * include/std/type_traits: Same. + + * include/std/memory: Add memory module. + + * include/std/ratio: Add ratio module. + + * include/std/chrono: Move namespace markup here, add time module. + + * include/std/thread: Move namespace markup here, add concurrency + module. + * include/std/mutex: Use concurrency module. + * include/std/condition_variable: Same. + + + * include/bits/ios_base.h: Refine io module. + * include/bits/basic_ios.h: Same. + * include/std/fstream: Same. + * include/std/istream: Same. + * include/std/ostream: Same. + * include/std/sstream: Same. + + * include/ext/vstring.h: Correct parameter markup. + + * include/bits/shared_ptr.h: Add pointer_abstractions module. + * include/bits/unique_ptr.h: Same. + + * include/bits/algorithmfwd.h: Add mutating_algorithms, + non_mutating_algorithms, sorting_algorithms. Adjust nesting. + * include/bits/stl_heap.h: Add markup for new groupings. + * include/bits/stl_algobase.h: Same. + * include/bits/stl_algo.h: Same. + + * include/c_compatibility/stdatomic.h: Add atomics module. + * include/c_global/cstdatomic: Same. + + * libsupc++/exception: Add exceptions module. + * libsupc++/typeinfo: Same. + * libsupc++/new: Same. + * libsupc++/exception_ptr.h: Same. + * include/std/system_error: Same. + * include/std/stdexcept: Same. + + * libsupc++/cxxabi.h: Move doxygroups.cc markup here. + * libsupc++/cxxabi-forced.h: Same. + + * testsuite/27_io/ios_base/cons/assign_neg.cc: Fix up line numbers. + * testsuite/27_io/ios_base/cons/copy_neg.cc: Same. + * testsuite/30_threads/condition_variable_any/cons/assign_neg.cc: Same. + * testsuite/30_threads/condition_variable_any/cons/copy_neg.cc: Same. + * testsuite/30_threads/mutex/cons/assign_neg.cc: Same. + * testsuite/30_threads/mutex/cons/copy_neg.cc: Same. + * testsuite/30_threads/timed_mutex/cons/assign_neg.cc: Same. + * testsuite/30_threads/timed_mutex/cons/copy_neg.cc: Same. + * testsuite/30_threads/thread/cons/assign_neg.cc: Same. + * testsuite/30_threads/thread/cons/copy_neg.cc: Same. + * testsuite/30_threads/recursive_mutex/cons/assign_neg.cc: Same. + * testsuite/30_threads/recursive_mutex/cons/copy_neg.cc: Same. + * testsuite/30_threads/condition_variable/cons/assign_neg.cc: Same. + * testsuite/30_threads/condition_variable/cons/copy_neg.cc: Same. + * testsuite/30_threads/recursive_timed_mutex/cons/assign_neg.cc: Same. + * testsuite/30_threads/recursive_timed_mutex/cons/copy_neg.cc: Same. + * testsuite/29_atomics/atomic/cons/assign_neg.cc: Same. + * testsuite/29_atomics/atomic/cons/copy_neg.cc: Same. + * testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Same. + * testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: Same. + * testsuite/23_containers/vector/requirements/dr438/ + constructor_1_neg.cc: Same. + * testsuite/23_containers/vector/requirements/dr438/ + constructor_2_neg.cc: Same. + * testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Same. + * testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: Same. + * testsuite/23_containers/deque/requirements/dr438/ + constructor_1_neg.cc: Same. + * testsuite/23_containers/deque/requirements/dr438/ + constructor_2_neg.cc: Same. + * testsuite/23_containers/list/requirements/dr438/assign_neg.cc: Same. + * 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. + * testsuite/20_util/duration/cons/1_neg.cc: Same. + * testsuite/20_util/duration/requirements/typedefs_neg1.cc: Same. + * testsuite/20_util/duration/requirements/typedefs_neg2.cc: Same. + * testsuite/20_util/duration/requirements/typedefs_neg3.cc: Same. + * testsuite/20_util/unique_ptr/modifiers/reset_neg.cc: Same. + * testsuite/20_util/unique_ptr/assign/assign.cc: Same. + * testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Same. + * testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Same. + * testsuite/20_util/ratio/cons/cons_overflow.cc: Same. + * testsuite/20_util/ratio/operations/ops_overflow.cc: Same. + 2009-02-18 Benjamin Kosnik <bkoz@redhat.com> * doc/doxygen/doxygroups.cc: Move algorithm groups into algorithmfwd.h. @@ -324,17 +466,17 @@ 2009-02-03 Johannes Singler <singler@ira.uka.de> - * include/parallel/algorithmfwd.h: - Add parallelism default for many declarations. - * include/parallel/numericfwd.h: Likewise. - * include/parallel/iterator.h: Use iterator_traits as usual. - * include/parallel/par_loop.h: - Include equally_split.h. - (for_each_template_random_access_ed): - Avoid calling the Result default constructor. - * include/parallel/numeric: Replace - for_each_template_random_access by - for_each_template_random_access_ed in numeric functions. + * include/parallel/algorithmfwd.h: + Add parallelism default for many declarations. + * include/parallel/numericfwd.h: Likewise. + * include/parallel/iterator.h: Use iterator_traits as usual. + * include/parallel/par_loop.h: + Include equally_split.h. + (for_each_template_random_access_ed): + Avoid calling the Result default constructor. + * include/parallel/numeric: Replace + for_each_template_random_access by + for_each_template_random_access_ed in numeric functions. 2009-02-02 Benjamin Kosnik <bkoz@redhat.com> @@ -450,7 +592,7 @@ * config/os/gnu-linux/ldbl-extra.ver: Tweak. 2009-01-20 Benjamin Kosnik <bkoz@redhat.com> - Rainer Emrich <r.emrich@de.tecosim.com> + Rainer Emrich <r.emrich@de.tecosim.com> PR libstdc++/38919 * crossconfig.m4: Use GLIBCXX_CHECK_MATH_SUPPORT and diff --git a/libstdc++-v3/doc/doxygen/doxygroups.cc b/libstdc++-v3/doc/doxygen/doxygroups.cc index cdca01ea4ff..d11fb3bd2d1 100644 --- a/libstdc++-v3/doc/doxygen/doxygroups.cc +++ b/libstdc++-v3/doc/doxygen/doxygroups.cc @@ -28,18 +28,6 @@ /** @namespace std::tr1::__detail * @brief Implementation details not part of the namespace std::tr1 interface. */ -/** @namespace std::chrono - * @brief ISO C++ 0x entities sub namespace for time and date. -*/ -/** @namespace std::placeholders - * @brief ISO C++ 0x entities sub namespace for functional. -*/ -/** @namespace std::regex_constants - * @brief ISO C++ 0x entities sub namespace for regex. -*/ -/** @namespace std::this_thread - * @brief ISO C++ 0x entities sub namespace for thread. -*/ /** @namespace __gnu_cxx * @brief GNU extensions for public use. */ @@ -52,71 +40,6 @@ * export. Used only when anonymous namespaces cannot be substituted. */ // // // // // // // // // // // // // // // // // // // // // // // // -/** @namespace abi - * @brief The cross-vendor C++ Application Binary Interface. A - * namespace alias to __cxxabiv1. - * - * A brief overview of an ABI is given in the libstdc++ FAQ, question - * 5.8 (you may have a copy of the FAQ locally, or you can view the online - * version at http://gcc.gnu.org/onlinedocs/libstdc++/faq/index.html#5_8). - * - * GCC subscribes to a relatively-new cross-vendor ABI for C++, sometimes - * called the IA64 ABI because it happens to be the native ABI for that - * platform. It is summarized at http://www.codesourcery.com/cxx-abi/ - * along with the current specification. - * - * For users of GCC greater than or equal to 3.x, entry points are - * available in <cxxabi.h>, which notes, <em>"It is not normally - * necessary for user programs to include this header, or use the - * entry points directly. However, this header is available should - * that be needed."</em> -*/ - -namespace abi { -/** -@brief New ABI-mandated entry point in the C++ runtime library for demangling. - -@param mangled_name A NUL-terminated character string containing the name - to be demangled. - -@param output_buffer A region of memory, allocated with malloc, of - @a *length bytes, into which the demangled name - is stored. If @a output_buffer is not long enough, - it is expanded using realloc. @a output_buffer may - instead be NULL; in that case, the demangled name is - placed in a region of memory allocated with malloc. - -@param length If @a length is non-NULL, the length of the buffer containing - the demangled name is placed in @a *length. - -@param status @a *status is set to one of the following values: - - 0: The demangling operation succeeded. - - -1: A memory allocation failiure occurred. - - -2: @a mangled_name is not a valid name under the C++ ABI - mangling rules. - - -3: One of the arguments is invalid. - -@return A pointer to the start of the NUL-terminated demangled name, or NULL - if the demangling fails. The caller is responsible for deallocating - this memory using @c free. - - -The demangling is performed using the C++ ABI mangling rules, with -GNU extensions. For example, this function is used -in __gnu_cxx::__verbose_terminate_handler. See -http://gcc.gnu.org/onlinedocs/libstdc++/18_support/howto.html#5 for other -examples of use. - -@note The same demangling functionality is available via libiberty -(@c <libiberty/demangle.h> and @c libiberty.a) in GCC 3.1 and later, but that -requires explicit installation (@c --enable-install-libiberty) and uses a -different API, although the ABI is unchanged. -*/ -char* __cxa_demangle (const char* mangled_name, char* output_buffer, - size_t* length, int* status); -} // namespace abi - -// // // // // // // // // // // // // // // // // // // // // // // // /** * @defgroup extensions Extensions @@ -142,10 +65,6 @@ comments all over the place, so they may seem stilted. <hr> */ -// // // // // // // // // // // // // // // // // // // // // // // // -// This is standalone because, unlike the functor introduction, there is no -// single header file which serves as a base "all containers must include -// this header". We do some quoting of 14882 here. /** @defgroup containers Containers Containers are collections of objects. @@ -169,9 +88,9 @@ All containers must meet certain requirements, summarized in <a href="tables.html">tables</a>. The standard containers are further refined into -@link Sequences Sequences@endlink and -@link Assoc_containers Associative Containers@endlink. -@link Unordered_assoc_containers Unordered Associative Containers@endlink. +@link sequences Sequences@endlink and +@link associative_containers Associative Containers@endlink. +@link unordered_associative_containers Unordered Associative Containers@endlink. */ /** @defgroup sequences Sequences @@ -218,9 +137,22 @@ elements of the container. All unordered associative containers must meet certain requirements, summarized in <a href="tables.html">tables</a>. */ -// // // // // // // // // // // // // // // // // // // // // // // // -/* * @defgroup groupname description of group -placeholder text -*/ +/** + * @defgroup diagnostics Diagnostics + * + * Components for error handling, reporting, and diagnostic operations. + */ -// // // // // // // // // // // // // // // // // // // // // // // // +/** + * @defgroup concurrency Concurrency + * + * Components for concurrent operations, including threads, mutexes, + * and condition variables. + */ + +/** + * @defgroup pointer_abstractions Pointer Abstractions + * @ingroup memory + * + * Components for memory allocation, deallocation, and management. + */ diff --git a/libstdc++-v3/doc/doxygen/user.cfg.in b/libstdc++-v3/doc/doxygen/user.cfg.in index 086f49920ea..aceb67098b3 100644 --- a/libstdc++-v3/doc/doxygen/user.cfg.in +++ b/libstdc++-v3/doc/doxygen/user.cfg.in @@ -416,7 +416,7 @@ SORT_BRIEF_DOCS = YES # hierarchy of group names into alphabetical order. If set to NO (the default) # the group names will appear in their defined order. -SORT_GROUP_NAMES = NO +SORT_GROUP_NAMES = YES # If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be # sorted by fully-qualified names, including namespaces. If set to @@ -539,7 +539,7 @@ WARN_IF_UNDOCUMENTED = NO # parameters in a documented function, or documenting parameters that # don't exist or using markup commands wrongly. -WARN_IF_DOC_ERROR = NO +WARN_IF_DOC_ERROR = YES # This WARN_NO_PARAMDOC option can be abled to get warnings for # functions that are documented, but have no documentation for their parameters @@ -573,9 +573,11 @@ WARN_LOGFILE = # "myfile.cpp" or directories like "/usr/src/myproject". Separate the # files or directories with spaces. -INPUT = @srcdir@/libsupc++/cxxabi.h \ +INPUT = @srcdir@/doc/doxygen/doxygroups.cc \ + @srcdir@/libsupc++/cxxabi.h \ @srcdir@/libsupc++/cxxabi-forced.h \ @srcdir@/libsupc++/exception \ + @srcdir@/libsupc++/exception_ptr.h \ @srcdir@/libsupc++/initializer_list \ @srcdir@/libsupc++/new \ @srcdir@/libsupc++/typeinfo \ @@ -713,18 +715,18 @@ INPUT = @srcdir@/libsupc++/cxxabi.h \ include/tr1_impl/unordered_map \ include/tr1_impl/unordered_set \ include/tr1_impl/utility \ + include/tr1_impl \ + include/tr1 \ include/ \ include/@host_alias@/bits \ include/backward \ include/bits \ + include/bits/shared_ptr.h \ include/debug \ include/parallel \ - include/tr1 \ - include/tr1_impl \ include/ext \ include/ext/pb_ds \ - include/ext/pb_ds/detail \ - @srcdir@/doc/doxygen/doxygroups.cc + include/ext/pb_ds/detail # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is @@ -1419,6 +1421,7 @@ PREDEFINED = __cplusplus \ __GTHREADS \ _GLIBCXX_HAS_GTHREADS \ __GXX_EXPERIMENTAL_CXX0X__ \ + _GLIBCXX_INCLUDE_AS_CXX0X \ "_GLIBCXX_STD_P= " \ "_GLIBCXX_STD_D= " \ _GLIBCXX_STD=std \ @@ -1430,11 +1433,12 @@ PREDEFINED = __cplusplus \ _GLIBCXX_END_NAMESPACE=} \ _GLIBCXX_END_NESTED_NAMESPACE=} \ "_GLIBCXX_TEMPLATE_ARGS=... " \ - _GLIBCXX_INCLUDE_AS_CXX0X \ _GLIBCXX_DEPRECATED \ _GLIBCXX_USE_WCHAR_T \ _GLIBCXX_USE_LONG_LONG \ _GLIBCXX_USE_C99_STDINT_TR1 \ + _GLIBCXX_USE_SCHED_YIELD \ + _GLIBCXX_USE_NANOSLEEP \ __glibcxx_function_requires=// \ __glibcxx_class_requires=// \ __glibcxx_class_requires2=// \ diff --git a/libstdc++-v3/include/backward/binders.h b/libstdc++-v3/include/backward/binders.h index 1e8e509dc1c..5043154222b 100644 --- a/libstdc++-v3/include/backward/binders.h +++ b/libstdc++-v3/include/backward/binders.h @@ -65,7 +65,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // 20.3.6 binders - /** @defgroup binder Binder Classes + /** @defgroup binders Binder Classes * @ingroup functors * * Binders turn functions/functors with two arguments into functors with @@ -97,7 +97,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * * @{ */ - /// One of the @link binder binder functors@endlink. + /// One of the @link binders binder functors@endlink. template<typename _Operation> class binder1st : public unary_function<typename _Operation::second_argument_type, @@ -123,7 +123,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) { return op(value, __x); } } _GLIBCXX_DEPRECATED_ATTR; - /// One of the @link binder binder functors@endlink. + /// One of the @link binders binder functors@endlink. template<typename _Operation, typename _Tp> inline binder1st<_Operation> bind1st(const _Operation& __fn, const _Tp& __x) @@ -132,7 +132,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) return binder1st<_Operation>(__fn, _Arg1_type(__x)); } - /// One of the @link binder binder functors@endlink. + /// One of the @link binders binder functors@endlink. template<typename _Operation> class binder2nd : public unary_function<typename _Operation::first_argument_type, @@ -158,7 +158,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) { return op(__x, value); } } _GLIBCXX_DEPRECATED_ATTR; - /// One of the @link binder binder functors@endlink. + /// One of the @link binders binder functors@endlink. template<typename _Operation, typename _Tp> inline binder2nd<_Operation> bind2nd(const _Operation& __fn, const _Tp& __x) diff --git a/libstdc++-v3/include/bits/algorithmfwd.h b/libstdc++-v3/include/bits/algorithmfwd.h index eb2d2ddbe42..3179b58c562 100644 --- a/libstdc++-v3/include/bits/algorithmfwd.h +++ b/libstdc++-v3/include/bits/algorithmfwd.h @@ -129,8 +129,23 @@ _GLIBCXX_BEGIN_NAMESPACE(std) */ /** - * @defgroup set_algorithms Set Operation Algorithms + * @defgroup mutating_algorithms Mutating Algorithms + * @ingroup algorithms + */ + + /** + * @defgroup non_mutating_algorithms Non-Mutating Algorithms + * @ingroup algorithms + */ + + /** + * @defgroup sorting_algorithms Sorting Algorithms * @ingroup algorithms + */ + + /** + * @defgroup set_algorithms Set Operation Algorithms + * @ingroup sorting_algorithms * * These algorithms are common set operations performed on sequences * that are already sorted. The number of comparisons will be @@ -139,7 +154,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @defgroup binary_search_algorithms Binary Search Algorithms - * @ingroup algorithms + * @ingroup sorting_algorithms * * These algorithms are variations of a classic binary search, and * all assume that the sequence being searched is already sorted. diff --git a/libstdc++-v3/include/bits/allocator.h b/libstdc++-v3/include/bits/allocator.h index a90f7b4105b..43882997c68 100644 --- a/libstdc++-v3/include/bits/allocator.h +++ b/libstdc++-v3/include/bits/allocator.h @@ -1,6 +1,6 @@ // Allocators -*- C++ -*- -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -54,6 +54,13 @@ _GLIBCXX_BEGIN_NAMESPACE(std) + /** + * @defgroup allocators Allocators + * @ingroup memory + * + * Classes encapsulating memory operations. + */ + template<typename _Tp> class allocator; @@ -75,6 +82,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief The "standard" allocator, as per [20.4]. + * @ingroup allocators * * Further details: * http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt04ch11.html diff --git a/libstdc++-v3/include/bits/basic_ios.h b/libstdc++-v3/include/bits/basic_ios.h index 3b1052b26a1..d859b861f8d 100644 --- a/libstdc++-v3/include/bits/basic_ios.h +++ b/libstdc++-v3/include/bits/basic_ios.h @@ -1,7 +1,7 @@ // Iostreams base classes -*- C++ -*- // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -// 2006, 2007, 2008 +// 2006, 2007, 2008, 2009 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -58,6 +58,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // 27.4.5 Template class basic_ios /** * @brief Virtual base class for all stream classes. + * @ingroup io * * Most of the member functions called dispatched on stream objects * (e.g., @c std::cout.foo(bar);) are consolidated in this class. diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h index 1f6dac97275..2a49837029d 100644 --- a/libstdc++-v3/include/bits/basic_string.h +++ b/libstdc++-v3/include/bits/basic_string.h @@ -53,7 +53,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * @class basic_string basic_string.h <string> * @brief Managing sequences of characters and character-like objects. * - * @ingroup containers * @ingroup sequences * * Meets the requirements of a <a href="tables.html#65">container</a>, a diff --git a/libstdc++-v3/include/bits/forward_list.h b/libstdc++-v3/include/bits/forward_list.h index 98a4a62e88e..89ced313fe5 100644 --- a/libstdc++-v3/include/bits/forward_list.h +++ b/libstdc++-v3/include/bits/forward_list.h @@ -400,7 +400,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * @brief A standard container with linear time access to elements, * and fixed time insertion/deletion at any point in the sequence. * - * @ingroup containers * @ingroup sequences * * Meets the requirements of a <a href="tables.html#65">container</a>, a diff --git a/libstdc++-v3/include/bits/gslice.h b/libstdc++-v3/include/bits/gslice.h index 7f305f05646..353097c219e 100644 --- a/libstdc++-v3/include/bits/gslice.h +++ b/libstdc++-v3/include/bits/gslice.h @@ -1,6 +1,6 @@ // The template and inlines for the -*- C++ -*- gslice class. -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2004, 2005, 2006 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2004, 2005, 2006, 2009 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -43,6 +43,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** + * @addtogroup numeric_arrays + * @{ + */ + + /** * @brief Class defining multi-dimensional subset of an array. * * The slice class represents a multi-dimensional subset of an array, @@ -175,6 +180,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) return *this; } + // @} group numeric_arrays + _GLIBCXX_END_NAMESPACE #endif /* _GSLICE_H */ diff --git a/libstdc++-v3/include/bits/gslice_array.h b/libstdc++-v3/include/bits/gslice_array.h index 55ddc3b17ce..7f0325b1891 100644 --- a/libstdc++-v3/include/bits/gslice_array.h +++ b/libstdc++-v3/include/bits/gslice_array.h @@ -1,6 +1,6 @@ // The template and inlines for the -*- C++ -*- gslice_array class. -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2004, 2005 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2004, 2005, 2009 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -43,6 +43,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** + * @addtogroup numeric_arrays + * @{ + */ + + /** * @brief Reference to multi-dimensional subset of an array. * * A gslice_array is a reference to the actual elements of an array @@ -209,6 +214,8 @@ _DEFINE_VALARRAY_OPERATOR(>>, __shift_right) #undef _DEFINE_VALARRAY_OPERATOR + // @} group numeric_arrays + _GLIBCXX_END_NAMESPACE #endif /* _GSLICE_ARRAY_H */ diff --git a/libstdc++-v3/include/bits/indirect_array.h b/libstdc++-v3/include/bits/indirect_array.h index d43d801c810..a22581d110f 100644 --- a/libstdc++-v3/include/bits/indirect_array.h +++ b/libstdc++-v3/include/bits/indirect_array.h @@ -1,6 +1,6 @@ // The template and inlines for the -*- C++ -*- indirect_array class. -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2004, 2005 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2009 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -43,6 +43,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** + * @addtogroup numeric_arrays + * @{ + */ + + /** * @brief Reference to arbitrary subset of an array. * * An indirect_array is a reference to the actual elements of an array @@ -203,6 +208,8 @@ _DEFINE_VALARRAY_OPERATOR(>>, __shift_right) #undef _DEFINE_VALARRAY_OPERATOR + // @} group numeric_arrays + _GLIBCXX_END_NAMESPACE #endif /* _INDIRECT_ARRAY_H */ diff --git a/libstdc++-v3/include/bits/ios_base.h b/libstdc++-v3/include/bits/ios_base.h index db040b86263..d9a17d78d4b 100644 --- a/libstdc++-v3/include/bits/ios_base.h +++ b/libstdc++-v3/include/bits/ios_base.h @@ -1,7 +1,7 @@ // Iostreams base classes -*- C++ -*- // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -// 2006, 2007, 2008 +// 2006, 2007, 2008, 2009 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -202,6 +202,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // 27.4.2 Class ios_base /** * @brief The base of the I/O class hierarchy. + * @ingroup io * * This class defines everything that can be defined about I/O that does * not depend on the type of characters being input or output. Most @@ -212,8 +213,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std) { public: - // 27.4.2.1.1 Class ios_base::failure - /// These are thrown to indicate problems. Doc me. + /** + * @brief These are thrown to indicate problems with io. + * @ingroup exceptions + * + * 27.4.2.1.1 Class ios_base::failure + */ class failure : public exception { public: diff --git a/libstdc++-v3/include/bits/mask_array.h b/libstdc++-v3/include/bits/mask_array.h index 98c8bfb36e3..dcd12cfbb79 100644 --- a/libstdc++-v3/include/bits/mask_array.h +++ b/libstdc++-v3/include/bits/mask_array.h @@ -1,6 +1,6 @@ // The template and inlines for the -*- C++ -*- mask_array class. -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2004, 2005 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2009 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -43,6 +43,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** + * @addtogroup numeric_arrays + * @{ + */ + + /** * @brief Reference to selected subset of an array. * * A mask_array is a reference to the actual elements of an array specified @@ -199,6 +204,8 @@ _DEFINE_VALARRAY_OPERATOR(>>, __shift_right) #undef _DEFINE_VALARRAY_OPERATOR + // @} group numeric_arrays + _GLIBCXX_END_NAMESPACE #endif /* _MASK_ARRAY_H */ diff --git a/libstdc++-v3/include/bits/shared_ptr.h b/libstdc++-v3/include/bits/shared_ptr.h index e4758dcdf38..8e70984971d 100644 --- a/libstdc++-v3/include/bits/shared_ptr.h +++ b/libstdc++-v3/include/bits/shared_ptr.h @@ -1,4 +1,4 @@ -// <bits/shared_ptr.h> -*- C++ -*- +// shared_ptr and weak_ptr implementation -*- C++ -*- // Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc. // @@ -59,8 +59,13 @@ # error C++0x header cannot be included from TR1 header #endif -namespace std -{ +_GLIBCXX_BEGIN_NAMESPACE(std) + + /** + * @addtogroup pointer_abstractions + * @{ + */ + // counted ptr with no deleter or allocator support template<typename _Ptr, _Lock_policy _Lp> class _Sp_counted_ptr @@ -541,13 +546,6 @@ namespace std { } - /** - * @class __shared_ptr - * - * A smart pointer with reference-counted copy semantics. - * The object pointed to is deleted when the last shared_ptr pointing to - * it is destroyed or reset. - */ template<typename _Tp, _Lock_policy _Lp> class __shared_ptr { @@ -1228,10 +1226,12 @@ namespace std mutable __weak_ptr<_Tp, _Lp> _M_weak_this; }; - - /// shared_ptr - // The actual shared_ptr, with forwarding constructors and - // assignment operators. + /** + * @brief A smart pointer with reference-counted copy semantics. + * + * The object pointed to is deleted when the last shared_ptr pointing to + * it is destroyed or reset. + */ template<typename _Tp> class shared_ptr : public __shared_ptr<_Tp> @@ -1405,9 +1405,11 @@ namespace std } - /// weak_ptr - // The actual weak_ptr, with forwarding constructors and - // assignment operators. + /** + * @brief A smart pointer with weak semantics. + * + * With forwarding constructors and assignment operators. + */ template<typename _Tp> class weak_ptr : public __weak_ptr<_Tp> @@ -1489,7 +1491,9 @@ namespace std : public _Sp_owner_less<weak_ptr<_Tp>, shared_ptr<_Tp>> { }; - /// enable_shared_from_this + /** + * @brief Base class allowing use of member function shared_from_this. + */ template<typename _Tp> class enable_shared_from_this { @@ -1549,7 +1553,7 @@ namespace std std::forward<_Args>(__args)...); } - /** @brief Create an object that is owned by a shared_ptr. + /** @brief Create an object that is owned by a shared_ptr. * @param __a An allocator. * @param __args Arguments for the @a _Tp object's constructor. * @return A shared_ptr that owns the newly created object. @@ -1582,4 +1586,6 @@ namespace std std::forward<_Args>(__args)...); } -} + // @} group pointer_abstractions + +_GLIBCXX_END_NAMESPACE diff --git a/libstdc++-v3/include/bits/slice_array.h b/libstdc++-v3/include/bits/slice_array.h index d95faa8cecf..27e794e73a6 100644 --- a/libstdc++-v3/include/bits/slice_array.h +++ b/libstdc++-v3/include/bits/slice_array.h @@ -1,6 +1,6 @@ // The template and inlines for the -*- C++ -*- slice_array class. -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2009 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -43,6 +43,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** + * @addtogroup numeric_arrays + * @{ + */ + + /** * @brief Class defining one-dimensional subset of an array. * * The slice class represents a one-dimensional subset of an array, @@ -265,6 +270,8 @@ _DEFINE_VALARRAY_OPERATOR(>>, __shift_right) #undef _DEFINE_VALARRAY_OPERATOR + // @} group numeric_arrays + _GLIBCXX_END_NAMESPACE #endif /* _SLICE_ARRAY_H */ diff --git a/libstdc++-v3/include/bits/stl_algo.h b/libstdc++-v3/include/bits/stl_algo.h index 64905fbd8eb..530999797f0 100644 --- a/libstdc++-v3/include/bits/stl_algo.h +++ b/libstdc++-v3/include/bits/stl_algo.h @@ -74,11 +74,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** - * @addtogroup algorithms Algorithms - * @{ - */ - - /** * @brief Find the median of three values. * @param a A value. * @param b A value. @@ -645,6 +640,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Find last matching subsequence in a sequence. + * @ingroup non_mutating_algorithms * @param first1 Start of range to search. * @param last1 End of range to search. * @param first2 Start of sequence to match. @@ -688,6 +684,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Find last matching subsequence in a sequence using a predicate. + * @ingroup non_mutating_algorithms * @param first1 Start of range to search. * @param last1 End of range to search. * @param first2 Start of sequence to match. @@ -738,6 +735,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Checks that a predicate is true for all the elements * of a sequence. + * @ingroup non_mutating_algorithms * @param first An input iterator. * @param last An input iterator. * @param pred A predicate. @@ -754,6 +752,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Checks that a predicate is false for all the elements * of a sequence. + * @ingroup non_mutating_algorithms * @param first An input iterator. * @param last An input iterator. * @param pred A predicate. @@ -770,6 +769,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Checks that a predicate is false for at least an element * of a sequence. + * @ingroup non_mutating_algorithms * @param first An input iterator. * @param last An input iterator. * @param pred A predicate. @@ -786,6 +786,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Find the first element in a sequence for which a * predicate is false. + * @ingroup non_mutating_algorithms * @param first An input iterator. * @param last An input iterator. * @param pred A predicate. @@ -808,6 +809,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Checks whether the sequence is partitioned. + * @ingroup mutating_algorithms * @param first An input iterator. * @param last An input iterator. * @param pred A predicate. @@ -826,6 +828,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Find the partition point of a partitioned range. + * @ingroup mutating_algorithms * @param first An iterator. * @param last Another iterator. * @param pred A predicate. @@ -873,6 +876,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Copy a sequence, removing elements of a given value. + * @ingroup mutating_algorithms * @param first An input iterator. * @param last An input iterator. * @param result An output iterator. @@ -908,6 +912,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Copy a sequence, removing elements for which a predicate is true. + * @ingroup mutating_algorithms * @param first An input iterator. * @param last An input iterator. * @param result An output iterator. @@ -946,6 +951,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) #ifdef __GXX_EXPERIMENTAL_CXX0X__ /** * @brief Copy the elements of a sequence for which a predicate is true. + * @ingroup mutating_algorithms * @param first An input iterator. * @param last An input iterator. * @param result An output iterator. @@ -1005,6 +1011,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Copies the range [first,first+n) into [result,result+n). + * @ingroup mutating_algorithms * @param first An input iterator. * @param n The number of elements to copy. * @param result An output iterator. @@ -1031,6 +1038,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Copy the elements of a sequence to separate output sequences * depending on the truth value of a predicate. + * @ingroup mutating_algorithms * @param first An input iterator. * @param last An input iterator. * @param out_true An output iterator. @@ -1077,6 +1085,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Remove elements from a sequence. + * @ingroup mutating_algorithms * @param first An input iterator. * @param last An input iterator. * @param value The value to be removed. @@ -1119,6 +1128,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Remove elements from a sequence using a predicate. + * @ingroup mutating_algorithms * @param first A forward iterator. * @param last A forward iterator. * @param pred A predicate. @@ -1161,6 +1171,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Remove consecutive duplicate values from a sequence. + * @ingroup mutating_algorithms * @param first A forward iterator. * @param last A forward iterator. * @return An iterator designating the end of the resulting sequence. @@ -1199,6 +1210,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Remove consecutive values from a sequence using a predicate. + * @ingroup mutating_algorithms * @param first A forward iterator. * @param last A forward iterator. * @param binary_pred A binary predicate. @@ -1429,6 +1441,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Reverse a sequence. + * @ingroup mutating_algorithms * @param first A bidirectional iterator. * @param last A bidirectional iterator. * @return reverse() returns no value. @@ -1451,6 +1464,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Copy a sequence, reversing its elements. + * @ingroup mutating_algorithms * @param first A bidirectional iterator. * @param last A bidirectional iterator. * @param result An output iterator. @@ -1640,6 +1654,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Rotate the elements of a sequence. + * @ingroup mutating_algorithms * @param first A forward iterator. * @param middle A forward iterator. * @param last A forward iterator. @@ -1674,6 +1689,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Copy a sequence, rotating its elements. + * @ingroup mutating_algorithms * @param first A forward iterator. * @param middle A forward iterator. * @param last A forward iterator. @@ -1833,6 +1849,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Move elements for which a predicate is true to the beginning * of a sequence, preserving relative ordering. + * @ingroup mutating_algorithms * @param first A forward iterator. * @param last A forward iterator. * @param pred A predicate functor. @@ -1912,6 +1929,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Copy the smallest elements of a sequence. + * @ingroup sorting_algorithms * @param first An iterator. * @param last Another iterator. * @param result_first A random-access iterator. @@ -1976,6 +1994,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Copy the smallest elements of a sequence using a predicate for * comparison. + * @ingroup sorting_algorithms * @param first An input iterator. * @param last Another input iterator. * @param result_first A random-access iterator. @@ -2440,6 +2459,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Finds the first position in which @a val could be inserted * without changing the ordering. + * @ingroup binary_search_algorithms * @param first An iterator. * @param last Another iterator. * @param val The search term. @@ -2492,6 +2512,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Finds the last position in which @a val could be inserted * without changing the ordering. + * @ingroup binary_search_algorithms * @param first An iterator. * @param last Another iterator. * @param val The search term. @@ -2538,6 +2559,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Finds the last position in which @a val could be inserted * without changing the ordering. + * @ingroup binary_search_algorithms * @param first An iterator. * @param last Another iterator. * @param val The search term. @@ -2590,6 +2612,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Finds the largest subrange in which @a val could be inserted * at any place in it without changing the ordering. + * @ingroup binary_search_algorithms * @param first An iterator. * @param last Another iterator. * @param val The search term. @@ -2717,11 +2740,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Determines whether an element exists in a range. + * @ingroup binary_search_algorithms * @param first An iterator. * @param last Another iterator. * @param val The search term. * @return True if @a val (or its equivalent) is in [@a first,@a last ]. - * @ingroup binary_search_algorithms * * Note that this does not actually return an iterator to @a val. For * that, use std::find or a container's specialized find member functions. @@ -2746,12 +2769,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Determines whether an element exists in a range. + * @ingroup binary_search_algorithms * @param first An iterator. * @param last Another iterator. * @param val The search term. * @param comp A functor to use for comparisons. * @return True if @a val (or its equivalent) is in [@a first,@a last ]. - * @ingroup binary_search_algorithms * * Note that this does not actually return an iterator to @a val. For * that, use std::find or a container's specialized find member functions. @@ -3091,6 +3114,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Merges two sorted ranges in place. + * @ingroup sorting_algorithms * @param first An iterator. * @param middle Another iterator. * @param last Another iterator. @@ -3141,6 +3165,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Merges two sorted ranges in place. + * @ingroup sorting_algorithms * @param first An iterator. * @param middle Another iterator. * @param last Another iterator. @@ -3477,6 +3502,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Determines whether all elements of a sequence exists in a range * using comparison. + * @ingroup set_algorithms * @param first1 Start of search range. * @param last1 End of search range. * @param first2 Start of sequence @@ -3538,6 +3564,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Permute range into the next "dictionary" ordering. + * @ingroup sorting_algorithms * @param first Start of range. * @param last End of range. * @return False if wrapped to first permutation, true otherwise. @@ -3592,6 +3619,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Permute range into the next "dictionary" ordering using * comparison functor. + * @ingroup sorting_algorithms * @param first Start of range. * @param last End of range. * @param comp A comparison functor. @@ -3648,6 +3676,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Permute range into the previous "dictionary" ordering. + * @ingroup sorting_algorithms * @param first Start of range. * @param last End of range. * @return False if wrapped to last permutation, true otherwise. @@ -3703,6 +3732,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Permute range into the previous "dictionary" ordering using * comparison functor. + * @ingroup sorting_algorithms * @param first Start of range. * @param last End of range. * @param comp A comparison functor. @@ -3799,6 +3829,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Copy a sequence, replacing each value for which a predicate * returns true with another value. + * @ingroup mutating_algorithms * @param first An input iterator. * @param last An input iterator. * @param result An output iterator. @@ -3836,6 +3867,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) #ifdef __GXX_EXPERIMENTAL_CXX0X__ /** * @brief Determines whether the elements of a sequence are sorted. + * @ingroup sorting_algorithms * @param first An iterator. * @param last Another iterator. * @return True if the elements are sorted, false otherwise. @@ -3848,6 +3880,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Determines whether the elements of a sequence are sorted * according to a comparison functor. + * @ingroup sorting_algorithms * @param first An iterator. * @param last Another iterator. * @param comp A comparison functor. @@ -3861,6 +3894,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Determines the end of a sorted sequence. + * @ingroup sorting_algorithms * @param first An iterator. * @param last Another iterator. * @return An iterator pointing to the last iterator i in [first, last) @@ -3888,6 +3922,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Determines the end of a sorted sequence using comparison functor. + * @ingroup sorting_algorithms * @param first An iterator. * @param last Another iterator. * @param comp A comparison functor. @@ -3918,6 +3953,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Determines min and max at once as an ordered pair. + * @ingroup sorting_algorithms * @param a A thing of arbitrary type. * @param b Another thing of arbitrary type. * @return A pair(b, a) if b is smaller than a, pair(a, b) otherwise. @@ -3935,6 +3971,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Determines min and max at once as an ordered pair. + * @ingroup sorting_algorithms * @param a A thing of arbitrary type. * @param b Another thing of arbitrary type. * @param comp A @link comparison_functor comparison functor@endlink. @@ -3951,6 +3988,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Return a pair of iterators pointing to the minimum and maximum * elements in a range. + * @ingroup sorting_algorithms * @param first Start of range. * @param last End of range. * @return make_pair(m, M), where m is the first iterator i in @@ -4025,6 +4063,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Return a pair of iterators pointing to the minimum and maximum * elements in a range. + * @ingroup sorting_algorithms * @param first Start of range. * @param last End of range. * @param comp Comparison functor. @@ -4139,19 +4178,13 @@ _GLIBCXX_BEGIN_NAMESPACE(std) } #endif // __GXX_EXPERIMENTAL_CXX0X__ - /* @} */ // group algorithms - _GLIBCXX_END_NAMESPACE _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** - * @addtogroup algorithms Algorithms - * @{ - */ - - /** * @brief Apply a function to every element of a sequence. + * @ingroup non_mutating_algorithms * @param first An input iterator. * @param last An input iterator. * @param f A unary function object. @@ -4175,6 +4208,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Find the first occurrence of a value in a sequence. + * @ingroup non_mutating_algorithms * @param first An input iterator. * @param last An input iterator. * @param val The value to find. @@ -4198,6 +4232,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Find the first element in a sequence for which a * predicate is true. + * @ingroup non_mutating_algorithms * @param first An input iterator. * @param last An input iterator. * @param pred A predicate. @@ -4220,6 +4255,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Find element from a set in a sequence. + * @ingroup non_mutating_algorithms * @param first1 Start of range to search. * @param last1 End of range to search. * @param first2 Start of match candidates. @@ -4255,6 +4291,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Find element from a set in a sequence using a predicate. + * @ingroup non_mutating_algorithms * @param first1 Start of range to search. * @param last1 End of range to search. * @param first2 Start of match candidates. @@ -4295,6 +4332,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Find two adjacent values in a sequence that are equal. + * @ingroup non_mutating_algorithms * @param first A forward iterator. * @param last A forward iterator. * @return The first iterator @c i such that @c i and @c i+1 are both @@ -4324,6 +4362,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Find two adjacent values in a sequence using a predicate. + * @ingroup non_mutating_algorithms * @param first A forward iterator. * @param last A forward iterator. * @param binary_pred A binary predicate. @@ -4357,6 +4396,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Count the number of copies of a value in a sequence. + * @ingroup non_mutating_algorithms * @param first An input iterator. * @param last An input iterator. * @param value The value to be counted. @@ -4381,6 +4421,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Count the elements of a sequence for which a predicate is true. + * @ingroup non_mutating_algorithms * @param first An input iterator. * @param last An input iterator. * @param pred A predicate. @@ -4405,6 +4446,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Search a sequence for a matching sub-sequence. + * @ingroup non_mutating_algorithms * @param first1 A forward iterator. * @param last1 A forward iterator. * @param first2 A forward iterator. @@ -4478,6 +4520,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Search a sequence for a matching sub-sequence using a predicate. + * @ingroup non_mutating_algorithms * @param first1 A forward iterator. * @param last1 A forward iterator. * @param first2 A forward iterator. @@ -4558,6 +4601,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Search a sequence for a number of consecutive values. + * @ingroup non_mutating_algorithms * @param first A forward iterator. * @param last A forward iterator. * @param count The number of consecutive values. @@ -4592,6 +4636,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Search a sequence for a number of consecutive values using a * predicate. + * @ingroup non_mutating_algorithms * @param first A forward iterator. * @param last A forward iterator. * @param count The number of consecutive values. @@ -4632,6 +4677,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Perform an operation on a sequence. + * @ingroup mutating_algorithms * @param first An input iterator. * @param last An input iterator. * @param result An output iterator. @@ -4665,6 +4711,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Perform an operation on corresponding elements of two sequences. + * @ingroup mutating_algorithms * @param first1 An input iterator. * @param last1 An input iterator. * @param first2 An input iterator. @@ -4703,6 +4750,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Replace each occurrence of one value in a sequence with another * value. + * @ingroup mutating_algorithms * @param first A forward iterator. * @param last A forward iterator. * @param old_value The value to be replaced. @@ -4734,6 +4782,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Replace each value in a sequence for which a predicate returns * true with another value. + * @ingroup mutating_algorithms * @param first A forward iterator. * @param last A forward iterator. * @param pred A predicate. @@ -4765,6 +4814,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Assign the result of a function object to each value in a * sequence. + * @ingroup mutating_algorithms * @param first A forward iterator. * @param last A forward iterator. * @param gen A function object taking no arguments and returning @@ -4792,6 +4842,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Assign the result of a function object to each value in a * sequence. + * @ingroup mutating_algorithms * @param first A forward iterator. * @param n The length of the sequence. * @param gen A function object taking no arguments and returning @@ -4818,6 +4869,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Copy a sequence, removing consecutive duplicate values. + * @ingroup mutating_algorithms * @param first An input iterator. * @param last An input iterator. * @param result An output iterator. @@ -4858,6 +4910,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Copy a sequence, removing consecutive values using a predicate. + * @ingroup mutating_algorithms * @param first An input iterator. * @param last An input iterator. * @param result An output iterator. @@ -4897,6 +4950,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Randomly shuffle the elements of a sequence. + * @ingroup mutating_algorithms * @param first A forward iterator. * @param last A forward iterator. * @return Nothing. @@ -4922,6 +4976,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Shuffle the elements of a sequence using a random number * generator. + * @ingroup mutating_algorithms * @param first A forward iterator. * @param last A forward iterator. * @param rand The RNG functor or function. @@ -4952,6 +5007,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Move elements for which a predicate is true to the beginning * of a sequence. + * @ingroup mutating_algorithms * @param first A forward iterator. * @param last A forward iterator. * @param pred A predicate functor. @@ -4983,6 +5039,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Sort the smallest elements of a sequence. + * @ingroup sorting_algorithms * @param first An iterator. * @param middle Another iterator. * @param last Another iterator. @@ -5019,6 +5076,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Sort the smallest elements of a sequence using a predicate * for comparison. + * @ingroup sorting_algorithms * @param first An iterator. * @param middle Another iterator. * @param last Another iterator. @@ -5058,6 +5116,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Sort a sequence just enough to find a particular position. + * @ingroup sorting_algorithms * @param first An iterator. * @param nth Another iterator. * @param last Another iterator. @@ -5096,6 +5155,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Sort a sequence just enough to find a particular position * using a predicate for comparison. + * @ingroup sorting_algorithms * @param first An iterator. * @param nth Another iterator. * @param last Another iterator. @@ -5135,6 +5195,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Sort the elements of a sequence. + * @ingroup sorting_algorithms * @param first An iterator. * @param last Another iterator. * @return Nothing. @@ -5169,6 +5230,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Sort the elements of a sequence using a predicate for comparison. + * @ingroup sorting_algorithms * @param first An iterator. * @param last Another iterator. * @param comp A comparison functor. @@ -5206,6 +5268,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Merges two sorted ranges. + * @ingroup sorting_algorithms * @param first1 An iterator. * @param first2 Another iterator. * @param last1 Another iterator. @@ -5264,6 +5327,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Merges two sorted ranges. + * @ingroup sorting_algorithms * @param first1 An iterator. * @param first2 Another iterator. * @param last1 Another iterator. @@ -5329,6 +5393,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Sort the elements of a sequence, preserving the relative order * of equivalent elements. + * @ingroup sorting_algorithms * @param first An iterator. * @param last Another iterator. * @return Nothing. @@ -5369,6 +5434,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Sort the elements of a sequence using a predicate for comparison, * preserving the relative order of equivalent elements. + * @ingroup sorting_algorithms * @param first An iterator. * @param last Another iterator. * @param comp A comparison functor. @@ -5413,6 +5479,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Return the union of two sorted ranges. + * @ingroup set_algorithms * @param first1 Start of first range. * @param last1 End of first range. * @param first2 Start of second range. @@ -5478,6 +5545,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Return the union of two sorted ranges using a comparison functor. + * @ingroup set_algorithms * @param first1 Start of first range. * @param last1 End of first range. * @param first2 Start of second range. @@ -5546,6 +5614,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Return the intersection of two sorted ranges. + * @ingroup set_algorithms * @param first1 Start of first range. * @param last1 End of first range. * @param first2 Start of second range. @@ -5600,6 +5669,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Return the intersection of two sorted ranges using comparison * functor. + * @ingroup set_algorithms * @param first1 Start of first range. * @param last1 End of first range. * @param first2 Start of second range. @@ -5657,6 +5727,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Return the difference of two sorted ranges. + * @ingroup set_algorithms * @param first1 Start of first range. * @param last1 End of first range. * @param first2 Start of second range. @@ -5715,6 +5786,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Return the difference of two sorted ranges using comparison * functor. + * @ingroup set_algorithms * @param first1 Start of first range. * @param last1 End of first range. * @param first2 Start of second range. @@ -5776,6 +5848,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Return the symmetric difference of two sorted ranges. + * @ingroup set_algorithms * @param first1 Start of first range. * @param last1 End of first range. * @param first2 Start of second range. @@ -5839,6 +5912,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Return the symmetric difference of two sorted ranges using * comparison functor. + * @ingroup set_algorithms * @param first1 Start of first range. * @param last1 End of first range. * @param first2 Start of second range. @@ -5907,6 +5981,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Return the minimum element in a range. + * @ingroup sorting_algorithms * @param first Start of range. * @param last End of range. * @return Iterator referencing the first instance of the smallest value. @@ -5932,6 +6007,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Return the minimum element in a range using comparison functor. + * @ingroup sorting_algorithms * @param first Start of range. * @param last End of range. * @param comp Comparison functor. @@ -5961,6 +6037,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Return the maximum element in a range. + * @ingroup sorting_algorithms * @param first Start of range. * @param last End of range. * @return Iterator referencing the first instance of the largest value. @@ -5986,6 +6063,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Return the maximum element in a range using comparison functor. + * @ingroup sorting_algorithms * @param first Start of range. * @param last End of range. * @param comp Comparison functor. @@ -6012,8 +6090,6 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) return __result; } - /* @} */ // group algorithms - _GLIBCXX_END_NESTED_NAMESPACE #endif /* _STL_ALGO_H */ diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h index a5f736e19dc..f370677da1c 100644 --- a/libstdc++-v3/include/bits/stl_algobase.h +++ b/libstdc++-v3/include/bits/stl_algobase.h @@ -78,11 +78,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std) - /** - * @addtogroup algorithms Algorithms - * @{ - */ - // See http://gcc.gnu.org/ml/libstdc++/2004-08/msg00167.html: in a // nutshell, we are partially implementing the resolution of DR 187, // when it's safe, i.e., the value_types are equal. @@ -114,6 +109,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Swaps the contents of two iterators. + * @ingroup mutating_algorithms * @param a An iterator. * @param b Another iterator. * @return Nothing. @@ -152,6 +148,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Swap the elements of two sequences. + * @ingroup mutating_algorithms * @param first1 A forward iterator. * @param last1 A forward iterator. * @param first2 A forward iterator. @@ -180,6 +177,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief This does what you think it does. + * @ingroup sorting_algorithms * @param a A thing of arbitrary type. * @param b Another thing of arbitrary type. * @return The lesser of the parameters. @@ -202,6 +200,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief This does what you think it does. + * @ingroup sorting_algorithms * @param a A thing of arbitrary type. * @param b Another thing of arbitrary type. * @return The greater of the parameters. @@ -224,6 +223,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief This does what you think it does. + * @ingroup sorting_algorithms * @param a A thing of arbitrary type. * @param b Another thing of arbitrary type. * @param comp A @link comparison_functors comparison functor@endlink. @@ -244,6 +244,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief This does what you think it does. + * @ingroup sorting_algorithms * @param a A thing of arbitrary type. * @param b Another thing of arbitrary type. * @param comp A @link comparison_functors comparison functor@endlink. @@ -442,6 +443,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Copies the range [first,last) into result. + * @ingroup mutating_algorithms * @param first An input iterator. * @param last An input iterator. * @param result An output iterator. @@ -474,6 +476,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) #ifdef __GXX_EXPERIMENTAL_CXX0X__ /** * @brief Moves the range [first,last) into result. + * @ingroup mutating_algorithms * @param first An input iterator. * @param last An input iterator. * @param result An output iterator. @@ -609,6 +612,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Copies the range [first,last) into result. + * @ingroup mutating_algorithms * @param first A bidirectional iterator. * @param last A bidirectional iterator. * @param result A bidirectional iterator. @@ -644,6 +648,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) #ifdef __GXX_EXPERIMENTAL_CXX0X__ /** * @brief Moves the range [first,last) into result. + * @ingroup mutating_algorithms * @param first A bidirectional iterator. * @param last A bidirectional iterator. * @param result A bidirectional iterator. @@ -715,6 +720,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Fills the range [first,last) with copies of value. + * @ingroup mutating_algorithms * @param first A forward iterator. * @param last A forward iterator. * @param value A reference-to-const of arbitrary type. @@ -769,6 +775,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Fills the range [first,first+n) with copies of value. + * @ingroup mutating_algorithms * @param first An output iterator. * @param n The count of copies to perform. * @param value A reference-to-const of arbitrary type. @@ -929,19 +936,13 @@ _GLIBCXX_BEGIN_NAMESPACE(std) __first2, __last2); } - /* @} */ // group algorithms - _GLIBCXX_END_NAMESPACE _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** - * @addtogroup algorithms Algorithms - * @{ - */ - - /** * @brief Tests a range for element-wise equality. + * @ingroup non_mutating_algorithms * @param first1 An input iterator. * @param last1 An input iterator. * @param first2 An input iterator. @@ -970,6 +971,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Tests a range for element-wise equality. + * @ingroup non_mutating_algorithms * @param first1 An input iterator. * @param last1 An input iterator. * @param first2 An input iterator. @@ -1000,6 +1002,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Performs "dictionary" comparison on ranges. + * @ingroup sorting_algorithms * @param first1 An input iterator. * @param last1 An input iterator. * @param first2 An input iterator. @@ -1036,6 +1039,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Performs "dictionary" comparison on ranges. + * @ingroup sorting_algorithms * @param first1 An input iterator. * @param last1 An input iterator. * @param first2 An input iterator. @@ -1075,6 +1079,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Finds the places in ranges which don't match. + * @ingroup non_mutating_algorithms * @param first1 An input iterator. * @param last1 An input iterator. * @param first2 An input iterator. @@ -1108,6 +1113,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) /** * @brief Finds the places in ranges which don't match. + * @ingroup non_mutating_algorithms * @param first1 An input iterator. * @param last1 An input iterator. * @param first2 An input iterator. @@ -1140,8 +1146,6 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P) return pair<_InputIterator1, _InputIterator2>(__first1, __first2); } - /* @} */ // group algorithms - _GLIBCXX_END_NESTED_NAMESPACE // NB: This file is included within many other C++ includes, as a way diff --git a/libstdc++-v3/include/bits/stl_bvector.h b/libstdc++-v3/include/bits/stl_bvector.h index beb89b64a76..416fba83244 100644 --- a/libstdc++-v3/include/bits/stl_bvector.h +++ b/libstdc++-v3/include/bits/stl_bvector.h @@ -467,7 +467,6 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) * really references and pointers to bool. See DR96 for details. @see * vector for function documentation. * - * @ingroup containers * @ingroup sequences * * In some terminology a %vector can be described as a dynamic diff --git a/libstdc++-v3/include/bits/stl_deque.h b/libstdc++-v3/include/bits/stl_deque.h index b02334bcfb6..1dbe0232c09 100644 --- a/libstdc++-v3/include/bits/stl_deque.h +++ b/libstdc++-v3/include/bits/stl_deque.h @@ -562,7 +562,6 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) * @brief A standard container using fixed-size memory allocation and * constant-time manipulation of elements at either end. * - * @ingroup containers * @ingroup sequences * * Meets the requirements of a <a href="tables.html#65">container</a>, a diff --git a/libstdc++-v3/include/bits/stl_heap.h b/libstdc++-v3/include/bits/stl_heap.h index 6b0840c4bda..10c2a9d38cc 100644 --- a/libstdc++-v3/include/bits/stl_heap.h +++ b/libstdc++-v3/include/bits/stl_heap.h @@ -1,6 +1,6 @@ // Heap implementation -*- C++ -*- -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -66,6 +66,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std) + /** + * @defgroup heap_algorithms Heap Algorithms + * @ingroup sorting_algorithms + */ + template<typename _RandomAccessIterator, typename _Distance> _Distance __is_heap_until(_RandomAccessIterator __first, _Distance __n) @@ -144,7 +149,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * @brief Push an element onto a heap. * @param first Start of heap. * @param last End of heap + element. - * @ingroup heap + * @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. @@ -192,7 +197,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * @param first Start of heap. * @param last End of heap + element. * @param comp Comparison functor. - * @ingroup heap + * @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. @@ -266,7 +271,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * @brief Pop an element off a heap. * @param first Start of heap. * @param last End of heap. - * @ingroup 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. @@ -339,7 +344,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * @param first Start of heap. * @param last End of heap. * @param comp Comparison functor to use. - * @ingroup 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. Comparisons are @@ -364,7 +369,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * @brief Construct a heap over a range. * @param first Start of heap. * @param last End of heap. - * @ingroup heap + * @ingroup heap_algorithms * * This operation makes the elements in [first,last) into a heap. */ @@ -403,7 +408,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * @param first Start of heap. * @param last End of heap. * @param comp Comparison functor to use. - * @ingroup heap + * @ingroup heap_algorithms * * This operation makes the elements in [first,last) into a heap. * Comparisons are made using comp. @@ -443,7 +448,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * @brief Sort a heap. * @param first Start of heap. * @param last End of heap. - * @ingroup heap + * @ingroup heap_algorithms * * This operation sorts the valid heap in the range [first,last). */ @@ -471,7 +476,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * @param first Start of heap. * @param last End of heap. * @param comp Comparison functor to use. - * @ingroup heap + * @ingroup heap_algorithms * * This operation sorts the valid heap in the range [first,last). * Comparisons are made using comp. @@ -500,7 +505,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * @param first Start of range. * @param last End of range. * @return An iterator pointing to the first element not in the heap. - * @ingroup heap + * @ingroup heap_algorithms * * This operation returns the last iterator i in [first, last) for which * the range [first, i) is a heap. @@ -526,7 +531,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * @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 + * @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. @@ -551,7 +556,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * @param first Start of range. * @param last End of range. * @return True if range is a heap, false otherwise. - * @ingroup heap + * @ingroup heap_algorithms */ template<typename _RandomAccessIterator> inline bool @@ -564,7 +569,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * @param last End of range. * @param comp Comparison functor to use. * @return True if range is a heap, false otherwise. - * @ingroup heap + * @ingroup heap_algorithms */ template<typename _RandomAccessIterator, typename _Compare> inline bool diff --git a/libstdc++-v3/include/bits/stl_list.h b/libstdc++-v3/include/bits/stl_list.h index 1bb6bbb9fe5..6eb1f23fa9f 100644 --- a/libstdc++-v3/include/bits/stl_list.h +++ b/libstdc++-v3/include/bits/stl_list.h @@ -379,7 +379,6 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) * @brief A standard container with linear time access to elements, * and fixed time insertion/deletion at any point in the sequence. * - * @ingroup containers * @ingroup sequences * * Meets the requirements of a <a href="tables.html#65">container</a>, a diff --git a/libstdc++-v3/include/bits/stl_map.h b/libstdc++-v3/include/bits/stl_map.h index d508534f178..d27592f2ab5 100644 --- a/libstdc++-v3/include/bits/stl_map.h +++ b/libstdc++-v3/include/bits/stl_map.h @@ -72,7 +72,6 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) * @brief A standard container made up of (key,value) pairs, which can be * retrieved based on a key, in logarithmic time. * - * @ingroup containers * @ingroup associative_containers * * Meets the requirements of a <a href="tables.html#65">container</a>, a diff --git a/libstdc++-v3/include/bits/stl_multimap.h b/libstdc++-v3/include/bits/stl_multimap.h index ed3576f0e89..3c8e7d739e7 100644 --- a/libstdc++-v3/include/bits/stl_multimap.h +++ b/libstdc++-v3/include/bits/stl_multimap.h @@ -71,7 +71,6 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) * @brief A standard container made up of (key,value) pairs, which can be * retrieved based on a key, in logarithmic time. * - * @ingroup containers * @ingroup associative_containers * * Meets the requirements of a <a href="tables.html#65">container</a>, a diff --git a/libstdc++-v3/include/bits/stl_multiset.h b/libstdc++-v3/include/bits/stl_multiset.h index fefbdf83e0d..6723c1a1fd1 100644 --- a/libstdc++-v3/include/bits/stl_multiset.h +++ b/libstdc++-v3/include/bits/stl_multiset.h @@ -71,7 +71,6 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) * @brief A standard container made up of elements, which can be retrieved * in logarithmic time. * - * @ingroup containers * @ingroup associative_containers * * Meets the requirements of a <a href="tables.html#65">container</a>, a diff --git a/libstdc++-v3/include/bits/stl_queue.h b/libstdc++-v3/include/bits/stl_queue.h index da91cb781cb..69ca0db6b6a 100644 --- a/libstdc++-v3/include/bits/stl_queue.h +++ b/libstdc++-v3/include/bits/stl_queue.h @@ -70,7 +70,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief A standard container giving FIFO behavior. * - * @ingroup containers * @ingroup sequences * * Meets many of the requirements of a @@ -338,7 +337,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief A standard container automatically sorting its contents. * - * @ingroup containers * @ingroup sequences * * This is not a true container, but an @e adaptor. It holds diff --git a/libstdc++-v3/include/bits/stl_set.h b/libstdc++-v3/include/bits/stl_set.h index 107a0717f2e..7fdf20f0a72 100644 --- a/libstdc++-v3/include/bits/stl_set.h +++ b/libstdc++-v3/include/bits/stl_set.h @@ -71,7 +71,6 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) * @brief A standard container made up of unique keys, which can be * retrieved in logarithmic time. * - * @ingroup containers * @ingroup associative_containers * * Meets the requirements of a <a href="tables.html#65">container</a>, a diff --git a/libstdc++-v3/include/bits/stl_stack.h b/libstdc++-v3/include/bits/stl_stack.h index 28477ad70a0..55a544a9e86 100644 --- a/libstdc++-v3/include/bits/stl_stack.h +++ b/libstdc++-v3/include/bits/stl_stack.h @@ -70,7 +70,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief A standard container giving FILO behavior. * - * @ingroup containers * @ingroup sequences * * Meets many of the requirements of a diff --git a/libstdc++-v3/include/bits/stl_vector.h b/libstdc++-v3/include/bits/stl_vector.h index e6bbf5d2bee..2350e7fc629 100644 --- a/libstdc++-v3/include/bits/stl_vector.h +++ b/libstdc++-v3/include/bits/stl_vector.h @@ -157,7 +157,6 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) * @brief A standard container which offers fixed time access to * individual elements in any order. * - * @ingroup containers * @ingroup sequences * * Meets the requirements of a <a href="tables.html#65">container</a>, a diff --git a/libstdc++-v3/include/bits/unique_ptr.h b/libstdc++-v3/include/bits/unique_ptr.h index 5e4fa8c7139..51573c01bb0 100644 --- a/libstdc++-v3/include/bits/unique_ptr.h +++ b/libstdc++-v3/include/bits/unique_ptr.h @@ -47,6 +47,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std) + /** + * @addtogroup pointer_abstractions + * @{ + */ + /// Primary template, default_delete. template<typename _Tp> struct default_delete @@ -443,6 +448,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) const unique_ptr<_Up, _Up_Deleter>& __y) { return !(__x.get() < __y.get()); } + // @} group pointer_abstractions + _GLIBCXX_END_NAMESPACE #endif /* _UNIQUE_PTR_H */ diff --git a/libstdc++-v3/include/c_compatibility/stdatomic.h b/libstdc++-v3/include/c_compatibility/stdatomic.h index be66600f085..776f6071a88 100644 --- a/libstdc++-v3/include/c_compatibility/stdatomic.h +++ b/libstdc++-v3/include/c_compatibility/stdatomic.h @@ -1,6 +1,6 @@ // -*- C++ -*- compatibility header. -// Copyright (C) 2008 Free Software Foundation, Inc. +// Copyright (C) 2008, 2009 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 @@ -41,6 +41,13 @@ _GLIBCXX_BEGIN_NAMESPACE(std) _GLIBCXX_BEGIN_EXTERN_C + /** + * @defgroup atomics Atomics + * + * Components for performing atomic operations. + * @{ + */ + /// Enumeration for memory_order typedef enum memory_order { @@ -179,6 +186,8 @@ _GLIBCXX_BEGIN_EXTERN_C atomic_flag_clear_explicit(__g, __x); \ __r; }) + // @} group atomics + _GLIBCXX_END_EXTERN_C _GLIBCXX_END_NAMESPACE diff --git a/libstdc++-v3/include/c_global/cstdatomic b/libstdc++-v3/include/c_global/cstdatomic index 82d699b8e81..8712178df8b 100644 --- a/libstdc++-v3/include/c_global/cstdatomic +++ b/libstdc++-v3/include/c_global/cstdatomic @@ -1,6 +1,6 @@ // -*- C++ -*- header. -// Copyright (C) 2008 +// Copyright (C) 2008, 2009 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -55,6 +55,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std) + /** + * @addtogroup atomics + * @{ + */ + /// kill_dependency template<typename _Tp> inline _Tp @@ -839,6 +844,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) atomic_fetch_xor(volatile __atomic_base<_ITp>* __a, _ITp __i) { return atomic_fetch_xor_explicit(__a, __i, memory_order_seq_cst); } + // @} group atomics + _GLIBCXX_END_NAMESPACE #endif diff --git a/libstdc++-v3/include/ext/array_allocator.h b/libstdc++-v3/include/ext/array_allocator.h index 665769d1fd5..cb8efb2f0cd 100644 --- a/libstdc++-v3/include/ext/array_allocator.h +++ b/libstdc++-v3/include/ext/array_allocator.h @@ -1,6 +1,7 @@ // array allocator -*- C++ -*- -// Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +// Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 +// 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 @@ -94,6 +95,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief An allocator that uses previously allocated memory. * This memory can be externally, globally, or otherwise allocated. + * @ingroup allocators */ template<typename _Tp, typename _Array = std::tr1::array<_Tp, 1> > class array_allocator : public array_allocator_base<_Tp> diff --git a/libstdc++-v3/include/ext/bitmap_allocator.h b/libstdc++-v3/include/ext/bitmap_allocator.h index 7f5466afe18..69f8a9d02ea 100644 --- a/libstdc++-v3/include/ext/bitmap_allocator.h +++ b/libstdc++-v3/include/ext/bitmap_allocator.h @@ -1,6 +1,7 @@ // Bitmap Allocator. -*- C++ -*- -// Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +// Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 +// 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 @@ -706,7 +707,10 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) }; }; - /// Primary template + /** + * @brief Bitmap Allocator, primary template. + * @ingroup allocators + */ template<typename _Tp> class bitmap_allocator : private free_list { diff --git a/libstdc++-v3/include/ext/debug_allocator.h b/libstdc++-v3/include/ext/debug_allocator.h index 43a9a871998..b80ec3e0b7c 100644 --- a/libstdc++-v3/include/ext/debug_allocator.h +++ b/libstdc++-v3/include/ext/debug_allocator.h @@ -56,6 +56,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief A meta-allocator with debugging bits, as per [20.4]. + * @ingroup allocators * * This is precisely the allocator defined in the C++ Standard. * - all allocation calls operator new diff --git a/libstdc++-v3/include/ext/extptr_allocator.h b/libstdc++-v3/include/ext/extptr_allocator.h index c0510fc883e..3785f05ed03 100644 --- a/libstdc++-v3/include/ext/extptr_allocator.h +++ b/libstdc++-v3/include/ext/extptr_allocator.h @@ -1,6 +1,6 @@ // <extptr_allocator.h> -*- C++ -*- -// Copyright (C) 2008 Free Software Foundation, Inc. +// Copyright (C) 2008, 2009 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 @@ -47,6 +47,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief An example allocator which uses a non-standard pointer type. + * @ingroup allocators * * This allocator specifies that containers use a 'relative pointer' as it's * pointer type. (See ext/pointer.h) Memory allocation in this example diff --git a/libstdc++-v3/include/ext/malloc_allocator.h b/libstdc++-v3/include/ext/malloc_allocator.h index 54d9c960007..84989bc16e6 100644 --- a/libstdc++-v3/include/ext/malloc_allocator.h +++ b/libstdc++-v3/include/ext/malloc_allocator.h @@ -1,6 +1,6 @@ // Allocator that wraps "C" malloc -*- C++ -*- -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -47,6 +47,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief An allocator that uses malloc. + * @ingroup allocators * * This is precisely the allocator defined in the C++ Standard. * - all allocation calls malloc diff --git a/libstdc++-v3/include/ext/mt_allocator.h b/libstdc++-v3/include/ext/mt_allocator.h index 7defebc7e94..749946f1c82 100644 --- a/libstdc++-v3/include/ext/mt_allocator.h +++ b/libstdc++-v3/include/ext/mt_allocator.h @@ -1,6 +1,6 @@ // MT-optimized allocator -*- C++ -*- -// Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 +// Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -620,6 +620,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) * size per thread plus a "global" one. Steps are taken to limit * the per thread freelist sizes (by returning excess back to * the "global" list). + * @ingroup allocators * * Further details: * http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt12ch32.html diff --git a/libstdc++-v3/include/ext/new_allocator.h b/libstdc++-v3/include/ext/new_allocator.h index aeda02f8f16..4dbc8b95179 100644 --- a/libstdc++-v3/include/ext/new_allocator.h +++ b/libstdc++-v3/include/ext/new_allocator.h @@ -1,6 +1,7 @@ // Allocator that wraps operator new -*- C++ -*- -// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2009 +// 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 @@ -45,6 +46,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief An allocator that uses global new, as per [20.4]. + * @ingroup allocators * * This is precisely the allocator defined in the C++ Standard. * - all allocation calls operator new diff --git a/libstdc++-v3/include/ext/pool_allocator.h b/libstdc++-v3/include/ext/pool_allocator.h index 96eedd8df46..41ae4f4adfd 100644 --- a/libstdc++-v3/include/ext/pool_allocator.h +++ b/libstdc++-v3/include/ext/pool_allocator.h @@ -1,6 +1,6 @@ // Allocators -*- C++ -*- -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -119,7 +119,10 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) }; - /// class __pool_alloc. + /** + * @brief Allocator using a memory pool with a single lock. + * @ingroup allocators + */ template<typename _Tp> class __pool_alloc : private __pool_alloc_base { diff --git a/libstdc++-v3/include/ext/throw_allocator.h b/libstdc++-v3/include/ext/throw_allocator.h index 41c7603abd4..e4fc40285ac 100644 --- a/libstdc++-v3/include/ext/throw_allocator.h +++ b/libstdc++-v3/include/ext/throw_allocator.h @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +// Copyright (C) 2005, 2006, 2007, 2008, 2009 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 terms @@ -79,7 +79,10 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) get_prob(); }; - /// Thown by throw_allocator. + /** + * @brief Thown by throw_allocator. + * @ingroup exceptions + */ struct forced_exception_error : public std::exception { }; @@ -184,7 +187,10 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) static size_t _S_label; }; - /// Allocator class with logging and exception control. + /** + * @brief Allocator class with logging and exception control. + * @ingroup allocators + */ template<typename T> class throw_allocator : public throw_allocator_base { diff --git a/libstdc++-v3/include/ext/vstring.h b/libstdc++-v3/include/ext/vstring.h index ea1652db54e..cea0f0a4fb2 100644 --- a/libstdc++-v3/include/ext/vstring.h +++ b/libstdc++-v3/include/ext/vstring.h @@ -1,6 +1,6 @@ // Versatile string -*- C++ -*- -// Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +// Copyright (C) 2005, 2006, 2007, 2008, 2009 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 @@ -142,7 +142,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) // NB: per LWG issue 42, semantics different from IS: /** * @brief Construct string with copy of value of @a str. - * @param str Source string. + * @param __str Source string. */ __versa_string(const __versa_string& __str) : __vstring_base(__str) { } @@ -150,18 +150,19 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) #ifdef __GXX_EXPERIMENTAL_CXX0X__ /** * @brief String move constructor. - * @param str Source string. + * @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 string. + * The newly-constructed %string contains the exact contents of + * @a str. The contents of @a str are a valid, but unspecified + * string. */ __versa_string(__versa_string&& __str) : __vstring_base(std::forward<__vstring_base>(__str)) { } /** * @brief Construct string from an initializer list. - * @param l std::initializer_list of characters. - * @param a Allocator to use (default is default allocator). + * @param __l std::initializer_list of characters. + * @param __a Allocator to use (default is default allocator). */ __versa_string(std::initializer_list<_CharT> __l, const _Alloc& __a = _Alloc()) @@ -170,9 +171,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Construct string as copy of a substring. - * @param str Source string. - * @param pos Index of first character to copy from. - * @param n Number of characters to copy (default remainder). + * @param __str Source string. + * @param __pos Index of first character to copy from. + * @param __n Number of characters to copy (default remainder). */ __versa_string(const __versa_string& __str, size_type __pos, size_type __n = npos) @@ -184,10 +185,10 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Construct string as copy of a substring. - * @param str Source string. - * @param pos Index of first character to copy from. - * @param n Number of characters to copy. - * @param a Allocator to use. + * @param __str Source string. + * @param __pos Index of first character to copy from. + * @param __n Number of characters to copy. + * @param __a Allocator to use. */ __versa_string(const __versa_string& __str, size_type __pos, size_type __n, const _Alloc& __a) @@ -199,11 +200,11 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Construct string initialized by a character array. - * @param s Source character array. - * @param n Number of characters to copy. - * @param a Allocator to use (default is default allocator). + * @param __s Source character array. + * @param __n Number of characters to copy. + * @param __a Allocator to use (default is default allocator). * - * NB: @a s must have at least @a n characters, '\0' has no special + * NB: @a __s must have at least @a __n characters, '\0' has no special * meaning. */ __versa_string(const _CharT* __s, size_type __n, @@ -212,8 +213,8 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Construct string as copy of a C string. - * @param s Source C string. - * @param a Allocator to use (default is default allocator). + * @param __s Source C string. + * @param __a Allocator to use (default is default allocator). */ __versa_string(const _CharT* __s, const _Alloc& __a = _Alloc()) : __vstring_base(__s, __s ? __s + traits_type::length(__s) : @@ -221,18 +222,18 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Construct string as multiple characters. - * @param n Number of characters. - * @param c Character to use. - * @param a Allocator to use (default is default allocator). + * @param __n Number of characters. + * @param __c Character to use. + * @param __a Allocator to use (default is default allocator). */ __versa_string(size_type __n, _CharT __c, const _Alloc& __a = _Alloc()) : __vstring_base(__n, __c, __a) { } /** * @brief Construct string as copy of a range. - * @param beg Start of range. - * @param end End of range. - * @param a Allocator to use (default is default allocator). + * @param __beg Start of range. + * @param __end End of range. + * @param __a Allocator to use (default is default allocator). */ template<class _InputIterator> __versa_string(_InputIterator __beg, _InputIterator __end, @@ -246,7 +247,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Assign the value of @a str to this string. - * @param str Source string. + * @param __str Source string. */ __versa_string& operator=(const __versa_string& __str) @@ -255,10 +256,10 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) #ifdef __GXX_EXPERIMENTAL_CXX0X__ /** * @brief String move assignment operator. - * @param str Source string. + * @param __str Source string. * - * The contents of @a str are moved into this string (without copying). - * @a str is a valid, but unspecified string. + * The contents of @a __str are moved into this string (without + * copying). @a __str is a valid, but unspecified string. */ __versa_string& operator=(__versa_string&& __str) @@ -270,7 +271,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Set value to string constructed from initializer list. - * @param l std::initializer_list. + * @param __l std::initializer_list. */ __versa_string& operator=(std::initializer_list<_CharT> __l) @@ -281,8 +282,8 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) #endif /** - * @brief Copy contents of @a s into this string. - * @param s Source null-terminated string. + * @brief Copy contents of @a __s into this string. + * @param __s Source null-terminated string. */ __versa_string& operator=(const _CharT* __s) @@ -290,10 +291,10 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Set value to string of length 1. - * @param c Source character. + * @param __c Source character. * * Assigning to a character makes this string length 1 and - * (*this)[0] == @a c. + * (*this)[0] == @a __c. */ __versa_string& operator=(_CharT __c) @@ -434,34 +435,34 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Resizes the %string to the specified number of characters. - * @param n Number of characters the %string should contain. - * @param c Character to fill any new elements. + * @param __n Number of characters the %string should contain. + * @param __c Character to fill any new elements. * * This function will %resize the %string to the specified * number of characters. If the number is smaller than the * %string's current size the %string is truncated, otherwise - * the %string is extended and new elements are set to @a c. + * the %string is extended and new elements are set to @a __c. */ void resize(size_type __n, _CharT __c); /** * @brief Resizes the %string to the specified number of characters. - * @param n Number of characters the %string should contain. + * @param __n Number of characters the %string should contain. * - * This function will resize the %string to the specified length. If - * the new size is smaller than the %string's current size the %string - * is truncated, otherwise the %string is extended and new characters - * are default-constructed. For basic types such as char, this means - * setting them to 0. + * This function will resize the %string to the specified + * length. If the new size is smaller than the %string's + * current size the %string is truncated, otherwise the %string + * is extended and new characters are default-constructed. For + * basic types such as char, this means setting them to 0. */ void resize(size_type __n) { this->resize(__n, _CharT()); } /** - * Returns the total number of characters that the %string can hold - * before needing to allocate more memory. + * Returns the total number of characters that the %string can + * hold before needing to allocate more memory. */ size_type capacity() const @@ -470,8 +471,8 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Attempt to preallocate enough memory for specified number of * characters. - * @param res_arg Number of characters required. - * @throw std::length_error If @a res_arg exceeds @c max_size(). + * @param __res_arg Number of characters required. + * @throw std::length_error If @a __res_arg exceeds @c max_size(). * * This function attempts to reserve enough memory for the * %string to hold the specified number of characters. If the @@ -479,10 +480,10 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) * thrown. * * The advantage of this function is that if optimal code is a - * necessity and the user can determine the string length that will be - * required, the user can reserve the memory in %advance, and thus - * prevent a possible reallocation of memory and copying of %string - * data. + * necessity and the user can determine the string length that + * will be required, the user can reserve the memory in + * %advance, and thus prevent a possible reallocation of memory + * and copying of %string data. */ void reserve(size_type __res_arg = 0) @@ -505,7 +506,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) // Element access: /** * @brief Subscript access to the data contained in the %string. - * @param pos The index of the character to access. + * @param __pos The index of the character to access. * @return Read-only (constant) reference to the character. * * This operator allows for easy, array-style, data access. @@ -522,7 +523,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Subscript access to the data contained in the %string. - * @param pos The index of the character to access. + * @param __pos The index of the character to access. * @return Read/write reference to the character. * * This operator allows for easy, array-style, data access. @@ -543,13 +544,13 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Provides access to the data contained in the %string. - * @param n The index of the character to access. + * @param __n The index of the character to access. * @return Read-only (const) reference to the character. - * @throw std::out_of_range If @a n is an invalid index. + * @throw std::out_of_range If @a __n is an invalid index. * - * This function provides for safer data access. The parameter is - * first checked that it is in the range of the string. The function - * throws out_of_range if the check fails. + * This function provides for safer data access. The parameter + * is first checked that it is in the range of the string. The + * function throws out_of_range if the check fails. */ const_reference at(size_type __n) const @@ -561,14 +562,14 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Provides access to the data contained in the %string. - * @param n The index of the character to access. + * @param __n The index of the character to access. * @return Read/write reference to the character. - * @throw std::out_of_range If @a n is an invalid index. + * @throw std::out_of_range If @a __n is an invalid index. * - * This function provides for safer data access. The parameter is - * first checked that it is in the range of the string. The function - * throws out_of_range if the check fails. Success results in - * unsharing the string. + * This function provides for safer data access. The parameter + * is first checked that it is in the range of the string. The + * function throws out_of_range if the check fails. Success + * results in unsharing the string. */ reference at(size_type __n) @@ -616,7 +617,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) // Modifiers: /** * @brief Append a string to this string. - * @param str The string to append. + * @param __str The string to append. * @return Reference to this string. */ __versa_string& @@ -625,7 +626,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Append a C string. - * @param s The C string to append. + * @param __s The C string to append. * @return Reference to this string. */ __versa_string& @@ -634,7 +635,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Append a character. - * @param c The character to append. + * @param __c The character to append. * @return Reference to this string. */ __versa_string& @@ -647,7 +648,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) #ifdef __GXX_EXPERIMENTAL_CXX0X__ /** * @brief Append an initializer_list of characters. - * @param l The initializer_list of characters to be appended. + * @param __l The initializer_list of characters to be appended. * @return Reference to this string. */ __versa_string& @@ -657,7 +658,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Append a string to this string. - * @param str The string to append. + * @param __str The string to append. * @return Reference to this string. */ __versa_string& @@ -666,15 +667,16 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Append a substring. - * @param str The string to append. - * @param pos Index of the first character of str to append. - * @param n The number of characters to append. + * @param __str The string to append. + * @param __pos Index of the first character of str to append. + * @param __n The number of characters to append. * @return Reference to this string. * @throw std::out_of_range if @a pos is not a valid index. * - * This function appends @a n characters from @a str starting at @a pos - * to this string. If @a n is is larger than the number of available - * characters in @a str, the remainder of @a str is appended. + * This function appends @a __n characters from @a __str + * starting at @a __pos to this string. If @a __n is is larger + * than the number of available characters in @a __str, the + * remainder of @a __str is appended. */ __versa_string& append(const __versa_string& __str, size_type __pos, size_type __n) @@ -684,8 +686,8 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Append a C substring. - * @param s The C string to append. - * @param n The number of characters to append. + * @param __s The C string to append. + * @param __n The number of characters to append. * @return Reference to this string. */ __versa_string& @@ -698,7 +700,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Append a C string. - * @param s The C string to append. + * @param __s The C string to append. * @return Reference to this string. */ __versa_string& @@ -712,8 +714,8 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Append multiple characters. - * @param n The number of characters to append. - * @param c The character to use. + * @param __n The number of characters to append. + * @param __c The character to use. * @return Reference to this string. * * Appends n copies of c to this string. @@ -725,7 +727,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) #ifdef __GXX_EXPERIMENTAL_CXX0X__ /** * @brief Append an initializer_list of characters. - * @param l The initializer_list of characters to append. + * @param __l The initializer_list of characters to append. * @return Reference to this string. */ __versa_string& @@ -735,8 +737,8 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Append a range of characters. - * @param first Iterator referencing the first character to append. - * @param last Iterator marking the end of the range. + * @param __first Iterator referencing the first character to append. + * @param __last Iterator marking the end of the range. * @return Reference to this string. * * Appends characters in the range [first,last) to this string. @@ -748,7 +750,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Append a single character. - * @param c Character to append. + * @param __c Character to append. */ void push_back(_CharT __c) @@ -762,7 +764,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Set value to contents of another string. - * @param str Source string to use. + * @param __str Source string to use. * @return Reference to this string. */ __versa_string& @@ -774,15 +776,16 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Set value to a substring of a string. - * @param str The string to use. - * @param pos Index of the first character of str. - * @param n Number of characters to use. + * @param __str The string to use. + * @param __pos Index of the first character of str. + * @param __n Number of characters to use. * @return Reference to this string. - * @throw std::out_of_range if @a pos is not a valid index. + * @throw std::out_of_range if @a __pos is not a valid index. * - * This function sets this string to the substring of @a str consisting - * of @a n characters at @a pos. If @a n is is larger than the number - * of available characters in @a str, the remainder of @a str is used. + * This function sets this string to the substring of @a __str + * consisting of @a __n characters at @a __pos. If @a __n is + * is larger than the number of available characters in @a + * __str, the remainder of @a __str is used. */ __versa_string& assign(const __versa_string& __str, size_type __pos, size_type __n) @@ -792,13 +795,14 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Set value to a C substring. - * @param s The C string to use. - * @param n Number of characters to use. + * @param __s The C string to use. + * @param __n Number of characters to use. * @return Reference to this string. * - * This function sets the value of this string to the first @a n - * characters of @a s. If @a n is is larger than the number of - * available characters in @a s, the remainder of @a s is used. + * This function sets the value of this string to the first @a + * __n characters of @a __s. If @a __n is is larger than the + * number of available characters in @a __s, the remainder of + * @a __s is used. */ __versa_string& assign(const _CharT* __s, size_type __n) @@ -809,12 +813,12 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Set value to contents of a C string. - * @param s The C string to use. + * @param __s The C string to use. * @return Reference to this string. * - * This function sets the value of this string to the value of @a s. - * The data is copied, so there is no dependence on @a s once the - * function returns. + * This function sets the value of this string to the value of + * @a __s. The data is copied, so there is no dependence on @a + * __s once the function returns. */ __versa_string& assign(const _CharT* __s) @@ -826,12 +830,12 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Set value to multiple characters. - * @param n Length of the resulting string. - * @param c The character to use. + * @param __n Length of the resulting string. + * @param __c The character to use. * @return Reference to this string. * - * This function sets the value of this string to @a n copies of - * character @a c. + * This function sets the value of this string to @a __n copies of + * character @a __c. */ __versa_string& assign(size_type __n, _CharT __c) @@ -839,11 +843,12 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Set value to a range of characters. - * @param first Iterator referencing the first character to append. - * @param last Iterator marking the end of the range. + * @param __first Iterator referencing the first character to append. + * @param __last Iterator marking the end of the range. * @return Reference to this string. * - * Sets value of string to characters in the range [first,last). + * Sets value of string to characters in the range + * [first,last). */ template<class _InputIterator> __versa_string& @@ -853,7 +858,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) #ifdef __GXX_EXPERIMENTAL_CXX0X__ /** * @brief Set value to an initializer_list of characters. - * @param l The initializer_list of characters to assign. + * @param __l The initializer_list of characters to assign. * @return Reference to this string. */ __versa_string& @@ -863,15 +868,16 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Insert multiple characters. - * @param p Iterator referencing location in string to insert at. - * @param n Number of characters to insert - * @param c The character to insert. + * @param __p Iterator referencing location in string to insert at. + * @param __n Number of characters to insert + * @param __c The character to insert. * @throw std::length_error If new length exceeds @c max_size(). * - * Inserts @a n copies of character @a c starting at the position - * referenced by iterator @a p. If adding characters causes the length - * to exceed max_size(), length_error is thrown. The value of the - * string doesn't change if an error is thrown. + * Inserts @a __n copies of character @a __c starting at the + * position referenced by iterator @a __p. If adding + * characters causes the length to exceed max_size(), + * length_error is thrown. The value of the string doesn't + * change if an error is thrown. */ void insert(iterator __p, size_type __n, _CharT __c) @@ -879,14 +885,15 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Insert a range of characters. - * @param p Iterator referencing location in string to insert at. - * @param beg Start of range. - * @param end End of range. + * @param __p Iterator referencing location in string to insert at. + * @param __beg Start of range. + * @param __end End of range. * @throw std::length_error If new length exceeds @c max_size(). * - * Inserts characters in range [beg,end). If adding characters causes - * the length to exceed max_size(), length_error is thrown. The value - * of the string doesn't change if an error is thrown. + * Inserts characters in range [beg,end). If adding characters + * causes the length to exceed max_size(), length_error is + * thrown. The value of the string doesn't change if an error + * is thrown. */ template<class _InputIterator> void @@ -896,8 +903,8 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) #ifdef __GXX_EXPERIMENTAL_CXX0X__ /** * @brief Insert an initializer_list of characters. - * @param p Iterator referencing location in string to insert at. - * @param l The initializer_list of characters to insert. + * @param __p Iterator referencing location in string to insert at. + * @param __l The initializer_list of characters to insert. * @throw std::length_error If new length exceeds @c max_size(). */ void @@ -907,14 +914,15 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Insert value of a string. - * @param pos1 Iterator referencing location in string to insert at. - * @param str The string to insert. + * @param __pos1 Iterator referencing location in string to insert at. + * @param __str The string to insert. * @return Reference to this string. * @throw std::length_error If new length exceeds @c max_size(). * - * Inserts value of @a str starting at @a pos1. If adding characters - * causes the length to exceed max_size(), length_error is thrown. The - * value of the string doesn't change if an error is thrown. + * Inserts value of @a __str starting at @a __pos1. If adding + * characters causes the length to exceed max_size(), + * length_error is thrown. The value of the string doesn't + * change if an error is thrown. */ __versa_string& insert(size_type __pos1, const __versa_string& __str) @@ -923,21 +931,21 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Insert a substring. - * @param pos1 Iterator referencing location in string to insert at. - * @param str The string to insert. - * @param pos2 Start of characters in str to insert. - * @param n Number of characters to insert. + * @param __pos1 Iterator referencing location in string to insert at. + * @param __str The string to insert. + * @param __pos2 Start of characters in str to insert. + * @param __n Number of characters to insert. * @return Reference to this string. * @throw std::length_error If new length exceeds @c max_size(). - * @throw std::out_of_range If @a pos1 > size() or - * @a pos2 > @a str.size(). - * - * Starting at @a pos1, insert @a n character of @a str beginning with - * @a pos2. If adding characters causes the length to exceed - * max_size(), length_error is thrown. If @a pos1 is beyond the end of - * this string or @a pos2 is beyond the end of @a str, out_of_range is - * thrown. The value of the string doesn't change if an error is - * thrown. + * @throw std::out_of_range If @a __pos1 > size() or + * @a __pos2 > @a __str.size(). + * + * Starting at @a __pos1, insert @a __n character of @a __str + * beginning with @a __pos2. If adding characters causes the + * length to exceed max_size(), length_error is thrown. If @a + * __pos1 is beyond the end of this string or @a __pos2 is + * beyond the end of @a __str, out_of_range is thrown. The + * value of the string doesn't change if an error is thrown. */ __versa_string& insert(size_type __pos1, const __versa_string& __str, @@ -948,19 +956,19 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Insert a C substring. - * @param pos Iterator referencing location in string to insert at. - * @param s The C string to insert. - * @param n The number of characters to insert. + * @param __pos Iterator referencing location in string to insert at. + * @param __s The C string to insert. + * @param __n The number of characters to insert. * @return Reference to this string. * @throw std::length_error If new length exceeds @c max_size(). - * @throw std::out_of_range If @a pos is beyond the end of this + * @throw std::out_of_range If @a __pos is beyond the end of this * string. * - * Inserts the first @a n characters of @a s starting at @a pos. If - * adding characters causes the length to exceed max_size(), - * length_error is thrown. If @a pos is beyond end(), out_of_range is - * thrown. The value of the string doesn't change if an error is - * thrown. + * Inserts the first @a __n characters of @a __s starting at @a + * __pos. If adding characters causes the length to exceed + * max_size(), length_error is thrown. If @a __pos is beyond + * end(), out_of_range is thrown. The value of the string + * doesn't change if an error is thrown. */ __versa_string& insert(size_type __pos, const _CharT* __s, size_type __n) @@ -968,18 +976,18 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Insert a C string. - * @param pos Iterator referencing location in string to insert at. - * @param s The C string to insert. + * @param __pos Iterator referencing location in string to insert at. + * @param __s The C string to insert. * @return Reference to this string. * @throw std::length_error If new length exceeds @c max_size(). - * @throw std::out_of_range If @a pos is beyond the end of this + * @throw std::out_of_range If @a __pos is beyond the end of this * string. * - * Inserts the first @a n characters of @a s starting at @a pos. If - * adding characters causes the length to exceed max_size(), - * length_error is thrown. If @a pos is beyond end(), out_of_range is - * thrown. The value of the string doesn't change if an error is - * thrown. + * Inserts the first @a __n characters of @a __s starting at @a + * __pos. If adding characters causes the length to exceed + * max_size(), length_error is thrown. If @a __pos is beyond + * end(), out_of_range is thrown. The value of the string + * doesn't change if an error is thrown. */ __versa_string& insert(size_type __pos, const _CharT* __s) @@ -991,19 +999,19 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Insert multiple characters. - * @param pos Index in string to insert at. - * @param n Number of characters to insert - * @param c The character to insert. + * @param __pos Index in string to insert at. + * @param __n Number of characters to insert + * @param __c The character to insert. * @return Reference to this string. * @throw std::length_error If new length exceeds @c max_size(). - * @throw std::out_of_range If @a pos is beyond the end of this + * @throw std::out_of_range If @a __pos is beyond the end of this * string. * - * Inserts @a n copies of character @a c starting at index @a pos. If - * adding characters causes the length to exceed max_size(), - * length_error is thrown. If @a pos > length(), out_of_range is - * thrown. The value of the string doesn't change if an error is - * thrown. + * Inserts @a __n copies of character @a __c starting at index + * @a __pos. If adding characters causes the length to exceed + * max_size(), length_error is thrown. If @a __pos > length(), + * out_of_range is thrown. The value of the string doesn't + * change if an error is thrown. */ __versa_string& insert(size_type __pos, size_type __n, _CharT __c) @@ -1012,15 +1020,16 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Insert one character. - * @param p Iterator referencing position in string to insert at. - * @param c The character to insert. + * @param __p Iterator referencing position in string to insert at. + * @param __c The character to insert. * @return Iterator referencing newly inserted char. * @throw std::length_error If new length exceeds @c max_size(). * - * Inserts character @a c at position referenced by @a p. If adding - * character causes the length to exceed max_size(), length_error is - * thrown. If @a p is beyond end of string, out_of_range is thrown. - * The value of the string doesn't change if an error is thrown. + * Inserts character @a __c at position referenced by @a __p. + * If adding character causes the length to exceed max_size(), + * length_error is thrown. If @a __p is beyond end of string, + * out_of_range is thrown. The value of the string doesn't + * change if an error is thrown. */ iterator insert(iterator __p, _CharT __c) @@ -1034,17 +1043,18 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Remove characters. - * @param pos Index of first character to remove (default 0). - * @param n Number of characters to remove (default remainder). + * @param __pos Index of first character to remove (default 0). + * @param __n Number of characters to remove (default remainder). * @return Reference to this string. - * @throw std::out_of_range If @a pos is beyond the end of this + * @throw std::out_of_range If @a __pos is beyond the end of this * string. * - * Removes @a n characters from this string starting at @a pos. The - * length of the string is reduced by @a n. If there are < @a n - * characters to remove, the remainder of the string is truncated. If - * @a p is beyond end of string, out_of_range is thrown. The value of - * the string doesn't change if an error is thrown. + * Removes @a __n characters from this string starting at @a + * __pos. The length of the string is reduced by @a __n. If + * there are < @a __n characters to remove, the remainder of + * the string is truncated. If @a __p is beyond end of string, + * out_of_range is thrown. The value of the string doesn't + * change if an error is thrown. */ __versa_string& erase(size_type __pos = 0, size_type __n = npos) @@ -1056,11 +1066,11 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Remove one character. - * @param position Iterator referencing the character to remove. + * @param __position Iterator referencing the character to remove. * @return iterator referencing same location after removal. * - * Removes the character at @a position from this string. The value - * of the string doesn't change if an error is thrown. + * Removes the character at @a __position from this string. The + * value of the string doesn't change if an error is thrown. */ iterator erase(iterator __position) @@ -1075,12 +1085,13 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Remove a range of characters. - * @param first Iterator referencing the first character to remove. - * @param last Iterator referencing the end of the range. + * @param __first Iterator referencing the first character to remove. + * @param __last Iterator referencing the end of the range. * @return Iterator referencing location of first after removal. * - * Removes the characters in the range [first,last) from this string. - * The value of the string doesn't change if an error is thrown. + * Removes the characters in the range [first,last) from this + * string. The value of the string doesn't change if an error + * is thrown. */ iterator erase(iterator __first, iterator __last) @@ -1095,19 +1106,20 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Replace characters with value from another string. - * @param pos Index of first character to replace. - * @param n Number of characters to be replaced. - * @param str String to insert. + * @param __pos Index of first character to replace. + * @param __n Number of characters to be replaced. + * @param __str String to insert. * @return Reference to this string. - * @throw std::out_of_range If @a pos is beyond the end of this + * @throw std::out_of_range If @a __pos is beyond the end of this * string. * @throw std::length_error If new length exceeds @c max_size(). * - * Removes the characters in the range [pos,pos+n) from this string. - * In place, the value of @a str is inserted. If @a pos is beyond end - * of string, out_of_range is thrown. If the length of the result - * exceeds max_size(), length_error is thrown. The value of the string - * doesn't change if an error is thrown. + * Removes the characters in the range [pos,pos+n) from this + * string. In place, the value of @a __str is inserted. If @a + * __pos is beyond end of string, out_of_range is thrown. If + * the length of the result exceeds max_size(), length_error is + * thrown. The value of the string doesn't change if an error + * is thrown. */ __versa_string& replace(size_type __pos, size_type __n, const __versa_string& __str) @@ -1115,21 +1127,22 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Replace characters with value from another string. - * @param pos1 Index of first character to replace. - * @param n1 Number of characters to be replaced. - * @param str String to insert. - * @param pos2 Index of first character of str to use. - * @param n2 Number of characters from str to use. + * @param __pos1 Index of first character to replace. + * @param __n1 Number of characters to be replaced. + * @param __str String to insert. + * @param __pos2 Index of first character of str to use. + * @param __n2 Number of characters from str to use. * @return Reference to this string. - * @throw std::out_of_range If @a pos1 > size() or @a pos2 > + * @throw std::out_of_range If @a __pos1 > size() or @a __pos2 > * str.size(). * @throw std::length_error If new length exceeds @c max_size(). * - * Removes the characters in the range [pos1,pos1 + n) from this - * string. In place, the value of @a str is inserted. If @a pos is - * beyond end of string, out_of_range is thrown. If the length of the - * result exceeds max_size(), length_error is thrown. The value of the - * string doesn't change if an error is thrown. + * Removes the characters in the range [pos1,pos1 + n) from + * this string. In place, the value of @a __str is inserted. + * If @a __pos is beyond end of string, out_of_range is thrown. + * If the length of the result exceeds max_size(), length_error + * is thrown. The value of the string doesn't change if an + * error is thrown. */ __versa_string& replace(size_type __pos1, size_type __n1, const __versa_string& __str, @@ -1143,20 +1156,21 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Replace characters with value of a C substring. - * @param pos Index of first character to replace. - * @param n1 Number of characters to be replaced. - * @param s C string to insert. - * @param n2 Number of characters from @a s to use. + * @param __pos Index of first character to replace. + * @param __n1 Number of characters to be replaced. + * @param __s C string to insert. + * @param __n2 Number of characters from @a __s to use. * @return Reference to this string. - * @throw std::out_of_range If @a pos1 > size(). + * @throw std::out_of_range If @a __pos1 > size(). * @throw std::length_error If new length exceeds @c max_size(). * - * Removes the characters in the range [pos,pos + n1) from this string. - * In place, the first @a n2 characters of @a s are inserted, or all - * of @a s if @a n2 is too large. If @a pos is beyond end of string, - * out_of_range is thrown. If the length of result exceeds max_size(), - * length_error is thrown. The value of the string doesn't change if - * an error is thrown. + * Removes the characters in the range [pos,pos + n1) from this + * string. In place, the first @a __n2 characters of @a __s + * are inserted, or all of @a __s if @a __n2 is too large. If + * @a __pos is beyond end of string, out_of_range is thrown. + * If the length of result exceeds max_size(), length_error is + * thrown. The value of the string doesn't change if an error + * is thrown. */ __versa_string& replace(size_type __pos, size_type __n1, const _CharT* __s, @@ -1169,18 +1183,19 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Replace characters with value of a C string. - * @param pos Index of first character to replace. - * @param n1 Number of characters to be replaced. - * @param s C string to insert. + * @param __pos Index of first character to replace. + * @param __n1 Number of characters to be replaced. + * @param __s C string to insert. * @return Reference to this string. - * @throw std::out_of_range If @a pos > size(). + * @throw std::out_of_range If @a __pos > size(). * @throw std::length_error If new length exceeds @c max_size(). * - * Removes the characters in the range [pos,pos + n1) from this string. - * In place, the first @a n characters of @a s are inserted. If @a - * pos is beyond end of string, out_of_range is thrown. If the length - * of result exceeds max_size(), length_error is thrown. The value of - * the string doesn't change if an error is thrown. + * Removes the characters in the range [pos,pos + n1) from this + * string. In place, the first @a __n characters of @a __s are + * inserted. If @a pos is beyond end of string, out_of_range + * is thrown. If the length of result exceeds max_size(), + * length_error is thrown. The value of the string doesn't + * change if an error is thrown. */ __versa_string& replace(size_type __pos, size_type __n1, const _CharT* __s) @@ -1191,19 +1206,20 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Replace characters with multiple characters. - * @param pos Index of first character to replace. - * @param n1 Number of characters to be replaced. - * @param n2 Number of characters to insert. - * @param c Character to insert. + * @param __pos Index of first character to replace. + * @param __n1 Number of characters to be replaced. + * @param __n2 Number of characters to insert. + * @param __c Character to insert. * @return Reference to this string. - * @throw std::out_of_range If @a pos > size(). + * @throw std::out_of_range If @a __pos > size(). * @throw std::length_error If new length exceeds @c max_size(). * - * Removes the characters in the range [pos,pos + n1) from this string. - * In place, @a n2 copies of @a c are inserted. If @a pos is beyond - * end of string, out_of_range is thrown. If the length of result - * exceeds max_size(), length_error is thrown. The value of the string - * doesn't change if an error is thrown. + * Removes the characters in the range [pos,pos + n1) from this + * string. In place, @a __n2 copies of @a __c are inserted. + * If @a __pos is beyond end of string, out_of_range is thrown. + * If the length of result exceeds max_size(), length_error is + * thrown. The value of the string doesn't change if an error + * is thrown. */ __versa_string& replace(size_type __pos, size_type __n1, size_type __n2, _CharT __c) @@ -1212,16 +1228,16 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Replace range of characters with string. - * @param i1 Iterator referencing start of range to replace. - * @param i2 Iterator referencing end of range to replace. - * @param str String value to insert. + * @param __i1 Iterator referencing start of range to replace. + * @param __i2 Iterator referencing end of range to replace. + * @param __str String value to insert. * @return Reference to this string. * @throw std::length_error If new length exceeds @c max_size(). * - * Removes the characters in the range [i1,i2). In place, the value of - * @a str is inserted. If the length of result exceeds max_size(), - * length_error is thrown. The value of the string doesn't change if - * an error is thrown. + * Removes the characters in the range [i1,i2). In place, the + * value of @a __str is inserted. If the length of result + * exceeds max_size(), length_error is thrown. The value of + * the string doesn't change if an error is thrown. */ __versa_string& replace(iterator __i1, iterator __i2, const __versa_string& __str) @@ -1229,17 +1245,17 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Replace range of characters with C substring. - * @param i1 Iterator referencing start of range to replace. - * @param i2 Iterator referencing end of range to replace. - * @param s C string value to insert. - * @param n Number of characters from s to insert. + * @param __i1 Iterator referencing start of range to replace. + * @param __i2 Iterator referencing end of range to replace. + * @param __s C string value to insert. + * @param __n Number of characters from s to insert. * @return Reference to this string. * @throw std::length_error If new length exceeds @c max_size(). * - * Removes the characters in the range [i1,i2). In place, the first @a - * n characters of @a s are inserted. If the length of result exceeds - * max_size(), length_error is thrown. The value of the string doesn't - * change if an error is thrown. + * Removes the characters in the range [i1,i2). In place, the + * first @a n characters of @a __s are inserted. If the length + * of result exceeds max_size(), length_error is thrown. The + * value of the string doesn't change if an error is thrown. */ __versa_string& replace(iterator __i1, iterator __i2, const _CharT* __s, size_type __n) @@ -1251,16 +1267,16 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Replace range of characters with C string. - * @param i1 Iterator referencing start of range to replace. - * @param i2 Iterator referencing end of range to replace. - * @param s C string value to insert. + * @param __i1 Iterator referencing start of range to replace. + * @param __i2 Iterator referencing end of range to replace. + * @param __s C string value to insert. * @return Reference to this string. * @throw std::length_error If new length exceeds @c max_size(). * * Removes the characters in the range [i1,i2). In place, the - * characters of @a s are inserted. If the length of result exceeds - * max_size(), length_error is thrown. The value of the string doesn't - * change if an error is thrown. + * characters of @a __s are inserted. If the length of result + * exceeds max_size(), length_error is thrown. The value of + * the string doesn't change if an error is thrown. */ __versa_string& replace(iterator __i1, iterator __i2, const _CharT* __s) @@ -1271,17 +1287,17 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Replace range of characters with multiple characters - * @param i1 Iterator referencing start of range to replace. - * @param i2 Iterator referencing end of range to replace. - * @param n Number of characters to insert. - * @param c Character to insert. + * @param __i1 Iterator referencing start of range to replace. + * @param __i2 Iterator referencing end of range to replace. + * @param __n Number of characters to insert. + * @param __c Character to insert. * @return Reference to this string. * @throw std::length_error If new length exceeds @c max_size(). * - * Removes the characters in the range [i1,i2). In place, @a n copies - * of @a c are inserted. If the length of result exceeds max_size(), - * length_error is thrown. The value of the string doesn't change if - * an error is thrown. + * Removes the characters in the range [i1,i2). In place, @a + * __n copies of @a __c are inserted. If the length of result + * exceeds max_size(), length_error is thrown. The value of + * the string doesn't change if an error is thrown. */ __versa_string& replace(iterator __i1, iterator __i2, size_type __n, _CharT __c) @@ -1293,17 +1309,17 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Replace range of characters with range. - * @param i1 Iterator referencing start of range to replace. - * @param i2 Iterator referencing end of range to replace. - * @param k1 Iterator referencing start of range to insert. - * @param k2 Iterator referencing end of range to insert. + * @param __i1 Iterator referencing start of range to replace. + * @param __i2 Iterator referencing end of range to replace. + * @param __k1 Iterator referencing start of range to insert. + * @param __k2 Iterator referencing end of range to insert. * @return Reference to this string. * @throw std::length_error If new length exceeds @c max_size(). * - * Removes the characters in the range [i1,i2). In place, characters - * in the range [k1,k2) are inserted. If the length of result exceeds - * max_size(), length_error is thrown. The value of the string doesn't - * change if an error is thrown. + * Removes the characters in the range [i1,i2). In place, + * characters in the range [k1,k2) are inserted. If the length + * of result exceeds max_size(), length_error is thrown. The + * value of the string doesn't change if an error is thrown. */ template<class _InputIterator> __versa_string& @@ -1364,16 +1380,16 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) #ifdef __GXX_EXPERIMENTAL_CXX0X__ /** * @brief Replace range of characters with initializer_list. - * @param i1 Iterator referencing start of range to replace. - * @param i2 Iterator referencing end of range to replace. - * @param l The initializer_list of characters to insert. + * @param __i1 Iterator referencing start of range to replace. + * @param __i2 Iterator referencing end of range to replace. + * @param __l The initializer_list of characters to insert. * @return Reference to this string. * @throw std::length_error If new length exceeds @c max_size(). * - * Removes the characters in the range [i1,i2). In place, characters - * in the range [k1,k2) are inserted. If the length of result exceeds - * max_size(), length_error is thrown. The value of the string doesn't - * change if an error is thrown. + * Removes the characters in the range [i1,i2). In place, + * characters in the range [k1,k2) are inserted. If the length + * of result exceeds max_size(), length_error is thrown. The + * value of the string doesn't change if an error is thrown. */ __versa_string& replace(iterator __i1, iterator __i2, std::initializer_list<_CharT> __l) @@ -1407,24 +1423,25 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Copy substring into C string. - * @param s C string to copy value into. - * @param n Number of characters to copy. - * @param pos Index of first character to copy. + * @param __s C string to copy value into. + * @param __n Number of characters to copy. + * @param __pos Index of first character to copy. * @return Number of characters actually copied * @throw std::out_of_range If pos > size(). * - * Copies up to @a n characters starting at @a pos into the C string @a - * s. If @a pos is greater than size(), out_of_range is thrown. + * Copies up to @a __n characters starting at @a __pos into the + * C string @a s. If @a __pos is greater than size(), + * out_of_range is thrown. */ size_type copy(_CharT* __s, size_type __n, size_type __pos = 0) const; /** * @brief Swap contents with another string. - * @param s String to swap with. + * @param __s String to swap with. * - * Exchanges the contents of this string with that of @a s in constant - * time. + * Exchanges the contents of this string with that of @a __s in + * constant time. */ void #ifdef __GXX_EXPERIMENTAL_CXX0X__ @@ -1464,27 +1481,28 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Find position of a C substring. - * @param s C string to locate. - * @param pos Index of character to search from. - * @param n Number of characters from @a s to search for. + * @param __s C string to locate. + * @param __pos Index of character to search from. + * @param __n Number of characters from @a __s to search for. * @return Index of start of first occurrence. * - * Starting from @a pos, searches forward for the first @a n characters - * in @a s within this string. If found, returns the index where it - * begins. If not found, returns npos. + * Starting from @a __pos, searches forward for the first @a + * __n characters in @a __s within this string. If found, + * returns the index where it begins. If not found, returns + * npos. */ size_type find(const _CharT* __s, size_type __pos, size_type __n) const; /** * @brief Find position of a string. - * @param str String to locate. - * @param pos Index of character to search from (default 0). + * @param __str String to locate. + * @param __pos Index of character to search from (default 0). * @return Index of start of first occurrence. * - * Starting from @a pos, searches forward for value of @a str within - * this string. If found, returns the index where it begins. If not - * found, returns npos. + * Starting from @a __pos, searches forward for value of @a + * __str within this string. If found, returns the index where + * it begins. If not found, returns npos. */ size_type find(const __versa_string& __str, size_type __pos = 0) const @@ -1492,13 +1510,13 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Find position of a C string. - * @param s C string to locate. - * @param pos Index of character to search from (default 0). + * @param __s C string to locate. + * @param __pos Index of character to search from (default 0). * @return Index of start of first occurrence. * - * Starting from @a pos, searches forward for the value of @a s within - * this string. If found, returns the index where it begins. If not - * found, returns npos. + * Starting from @a __pos, searches forward for the value of @a + * __s within this string. If found, returns the index where + * it begins. If not found, returns npos. */ size_type find(const _CharT* __s, size_type __pos = 0) const @@ -1509,26 +1527,26 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Find position of a character. - * @param c Character to locate. - * @param pos Index of character to search from (default 0). + * @param __c Character to locate. + * @param __pos Index of character to search from (default 0). * @return Index of first occurrence. * - * Starting from @a pos, searches forward for @a c within this string. - * If found, returns the index where it was found. If not found, - * returns npos. + * Starting from @a __pos, searches forward for @a __c within + * this string. If found, returns the index where it was + * found. If not found, returns npos. */ size_type find(_CharT __c, size_type __pos = 0) const; /** * @brief Find last position of a string. - * @param str String to locate. - * @param pos Index of character to search back from (default end). + * @param __str String to locate. + * @param __pos Index of character to search back from (default end). * @return Index of start of last occurrence. * - * Starting from @a pos, searches backward for value of @a str within - * this string. If found, returns the index where it begins. If not - * found, returns npos. + * Starting from @a __pos, searches backward for value of @a + * __str within this string. If found, returns the index where + * it begins. If not found, returns npos. */ size_type rfind(const __versa_string& __str, size_type __pos = npos) const @@ -1536,27 +1554,28 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Find last position of a C substring. - * @param s C string to locate. - * @param pos Index of character to search back from. - * @param n Number of characters from s to search for. + * @param __s C string to locate. + * @param __pos Index of character to search back from. + * @param __n Number of characters from s to search for. * @return Index of start of last occurrence. * - * Starting from @a pos, searches backward for the first @a n - * characters in @a s within this string. If found, returns the index - * where it begins. If not found, returns npos. + * Starting from @a __pos, searches backward for the first @a + * __n characters in @a __s within this string. If found, + * returns the index where it begins. If not found, returns + * npos. */ size_type rfind(const _CharT* __s, size_type __pos, size_type __n) const; /** * @brief Find last position of a C string. - * @param s C string to locate. - * @param pos Index of character to start search at (default end). + * @param __s C string to locate. + * @param __pos Index of character to start search at (default end). * @return Index of start of last occurrence. * - * Starting from @a pos, searches backward for the value of @a s within - * this string. If found, returns the index where it begins. If not - * found, returns npos. + * Starting from @a __pos, searches backward for the value of + * @a __s within this string. If found, returns the index + * where it begins. If not found, returns npos. */ size_type rfind(const _CharT* __s, size_type __pos = npos) const @@ -1567,25 +1586,25 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Find last position of a character. - * @param c Character to locate. - * @param pos Index of character to search back from (default end). + * @param __c Character to locate. + * @param __pos Index of character to search back from (default end). * @return Index of last occurrence. * - * Starting from @a pos, searches backward for @a c within this string. - * If found, returns the index where it was found. If not found, - * returns npos. + * Starting from @a __pos, searches backward for @a __c within + * this string. If found, returns the index where it was + * found. If not found, returns npos. */ size_type rfind(_CharT __c, size_type __pos = npos) const; /** * @brief Find position of a character of string. - * @param str String containing characters to locate. - * @param pos Index of character to search from (default 0). + * @param __str String containing characters to locate. + * @param __pos Index of character to search from (default 0). * @return Index of first occurrence. * - * Starting from @a pos, searches forward for one of the characters of - * @a str within this string. If found, returns the index where it was + * Starting from @a __pos, searches forward for one of the characters of + * @a __str within this string. If found, returns the index where it was * found. If not found, returns npos. */ size_type @@ -1594,27 +1613,28 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Find position of a character of C substring. - * @param s String containing characters to locate. - * @param pos Index of character to search from. - * @param n Number of characters from s to search for. + * @param __s String containing characters to locate. + * @param __pos Index of character to search from. + * @param __n Number of characters from s to search for. * @return Index of first occurrence. * - * Starting from @a pos, searches forward for one of the first @a n - * characters of @a s within this string. If found, returns the index - * where it was found. If not found, returns npos. + * Starting from @a __pos, searches forward for one of the + * first @a __n characters of @a __s within this string. If + * found, returns the index where it was found. If not found, + * returns npos. */ size_type find_first_of(const _CharT* __s, size_type __pos, size_type __n) const; /** * @brief Find position of a character of C string. - * @param s String containing characters to locate. - * @param pos Index of character to search from (default 0). + * @param __s String containing characters to locate. + * @param __pos Index of character to search from (default 0). * @return Index of first occurrence. * - * Starting from @a pos, searches forward for one of the characters of - * @a s within this string. If found, returns the index where it was - * found. If not found, returns npos. + * Starting from @a __pos, searches forward for one of the + * characters of @a __s within this string. If found, returns + * the index where it was found. If not found, returns npos. */ size_type find_first_of(const _CharT* __s, size_type __pos = 0) const @@ -1625,13 +1645,13 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Find position of a character. - * @param c Character to locate. - * @param pos Index of character to search from (default 0). + * @param __c Character to locate. + * @param __pos Index of character to search from (default 0). * @return Index of first occurrence. * - * Starting from @a pos, searches forward for the character @a c within - * this string. If found, returns the index where it was found. If - * not found, returns npos. + * Starting from @a __pos, searches forward for the character + * @a __c within this string. If found, returns the index + * where it was found. If not found, returns npos. * * Note: equivalent to find(c, pos). */ @@ -1641,13 +1661,14 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Find last position of a character of string. - * @param str String containing characters to locate. - * @param pos Index of character to search back from (default end). + * @param __str String containing characters to locate. + * @param __pos Index of character to search back from (default end). * @return Index of last occurrence. * - * Starting from @a pos, searches backward for one of the characters of - * @a str within this string. If found, returns the index where it was - * found. If not found, returns npos. + * Starting from @a __pos, searches backward for one of the + * characters of @a __str within this string. If found, + * returns the index where it was found. If not found, returns + * npos. */ size_type find_last_of(const __versa_string& __str, size_type __pos = npos) const @@ -1655,27 +1676,28 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Find last position of a character of C substring. - * @param s C string containing characters to locate. - * @param pos Index of character to search back from. - * @param n Number of characters from s to search for. + * @param __s C string containing characters to locate. + * @param __pos Index of character to search back from. + * @param __n Number of characters from s to search for. * @return Index of last occurrence. * - * Starting from @a pos, searches backward for one of the first @a n - * characters of @a s within this string. If found, returns the index - * where it was found. If not found, returns npos. + * Starting from @a __pos, searches backward for one of the + * first @a __n characters of @a __s within this string. If + * found, returns the index where it was found. If not found, + * returns npos. */ size_type find_last_of(const _CharT* __s, size_type __pos, size_type __n) const; /** * @brief Find last position of a character of C string. - * @param s C string containing characters to locate. - * @param pos Index of character to search back from (default end). + * @param __s C string containing characters to locate. + * @param __pos Index of character to search back from (default end). * @return Index of last occurrence. * - * Starting from @a pos, searches backward for one of the characters of - * @a s within this string. If found, returns the index where it was - * found. If not found, returns npos. + * Starting from @a __pos, searches backward for one of the + * characters of @a __s within this string. If found, returns + * the index where it was found. If not found, returns npos. */ size_type find_last_of(const _CharT* __s, size_type __pos = npos) const @@ -1686,13 +1708,13 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Find last position of a character. - * @param c Character to locate. - * @param pos Index of character to search back from (default end). + * @param __c Character to locate. + * @param __pos Index of character to search back from (default end). * @return Index of last occurrence. * - * Starting from @a pos, searches backward for @a c within this string. - * If found, returns the index where it was found. If not found, - * returns npos. + * Starting from @a __pos, searches backward for @a __c within + * this string. If found, returns the index where it was + * found. If not found, returns npos. * * Note: equivalent to rfind(c, pos). */ @@ -1702,13 +1724,13 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Find position of a character not in string. - * @param str String containing characters to avoid. - * @param pos Index of character to search from (default 0). + * @param __str String containing characters to avoid. + * @param __pos Index of character to search from (default 0). * @return Index of first occurrence. * - * Starting from @a pos, searches forward for a character not contained - * in @a str within this string. If found, returns the index where it - * was found. If not found, returns npos. + * Starting from @a __pos, searches forward for a character not + * contained in @a __str within this string. If found, returns + * the index where it was found. If not found, returns npos. */ size_type find_first_not_of(const __versa_string& __str, size_type __pos = 0) const @@ -1716,14 +1738,15 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Find position of a character not in C substring. - * @param s C string containing characters to avoid. - * @param pos Index of character to search from. - * @param n Number of characters from s to consider. + * @param __s C string containing characters to avoid. + * @param __pos Index of character to search from. + * @param __n Number of characters from s to consider. * @return Index of first occurrence. * - * Starting from @a pos, searches forward for a character not contained - * in the first @a n characters of @a s within this string. If found, - * returns the index where it was found. If not found, returns npos. + * Starting from @a __pos, searches forward for a character not + * contained in the first @a __n characters of @a __s within + * this string. If found, returns the index where it was + * found. If not found, returns npos. */ size_type find_first_not_of(const _CharT* __s, size_type __pos, @@ -1731,13 +1754,13 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Find position of a character not in C string. - * @param s C string containing characters to avoid. - * @param pos Index of character to search from (default 0). + * @param __s C string containing characters to avoid. + * @param __pos Index of character to search from (default 0). * @return Index of first occurrence. * - * Starting from @a pos, searches forward for a character not contained - * in @a s within this string. If found, returns the index where it - * was found. If not found, returns npos. + * Starting from @a __pos, searches forward for a character not + * contained in @a __s within this string. If found, returns + * the index where it was found. If not found, returns npos. */ size_type find_first_not_of(const _CharT* __s, size_type __pos = 0) const @@ -1748,26 +1771,27 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Find position of a different character. - * @param c Character to avoid. - * @param pos Index of character to search from (default 0). + * @param __c Character to avoid. + * @param __pos Index of character to search from (default 0). * @return Index of first occurrence. * - * Starting from @a pos, searches forward for a character other than @a c - * within this string. If found, returns the index where it was found. - * If not found, returns npos. + * Starting from @a __pos, searches forward for a character + * other than @a __c within this string. If found, returns the + * index where it was found. If not found, returns npos. */ size_type find_first_not_of(_CharT __c, size_type __pos = 0) const; /** * @brief Find last position of a character not in string. - * @param str String containing characters to avoid. - * @param pos Index of character to search back from (default end). + * @param __str String containing characters to avoid. + * @param __pos Index of character to search back from (default end). * @return Index of last occurrence. * - * Starting from @a pos, searches backward for a character not - * contained in @a str within this string. If found, returns the index - * where it was found. If not found, returns npos. + * Starting from @a __pos, searches backward for a character + * not contained in @a __str within this string. If found, + * returns the index where it was found. If not found, returns + * npos. */ size_type find_last_not_of(const __versa_string& __str, @@ -1776,28 +1800,29 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Find last position of a character not in C substring. - * @param s C string containing characters to avoid. - * @param pos Index of character to search back from. - * @param n Number of characters from s to consider. + * @param __s C string containing characters to avoid. + * @param __pos Index of character to search back from. + * @param __n Number of characters from s to consider. * @return Index of last occurrence. * - * Starting from @a pos, searches backward for a character not - * contained in the first @a n characters of @a s within this string. - * If found, returns the index where it was found. If not found, - * returns npos. + * Starting from @a __pos, searches backward for a character + * not contained in the first @a __n characters of @a __s + * within this string. If found, returns the index where it + * was found. If not found, returns npos. */ size_type find_last_not_of(const _CharT* __s, size_type __pos, size_type __n) const; /** * @brief Find last position of a character not in C string. - * @param s C string containing characters to avoid. - * @param pos Index of character to search back from (default end). + * @param __s C string containing characters to avoid. + * @param __pos Index of character to search back from (default end). * @return Index of last occurrence. * - * Starting from @a pos, searches backward for a character not - * contained in @a s within this string. If found, returns the index - * where it was found. If not found, returns npos. + * Starting from @a __pos, searches backward for a character + * not contained in @a __s within this string. If found, + * returns the index where it was found. If not found, returns + * npos. */ size_type find_last_not_of(const _CharT* __s, size_type __pos = npos) const @@ -1808,28 +1833,28 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Find last position of a different character. - * @param c Character to avoid. - * @param pos Index of character to search back from (default end). + * @param __c Character to avoid. + * @param __pos Index of character to search back from (default end). * @return Index of last occurrence. * - * Starting from @a pos, searches backward for a character other than - * @a c within this string. If found, returns the index where it was - * found. If not found, returns npos. + * Starting from @a __pos, searches backward for a character + * other than @a __c within this string. If found, returns the + * index where it was found. If not found, returns npos. */ size_type find_last_not_of(_CharT __c, size_type __pos = npos) const; /** * @brief Get a substring. - * @param pos Index of first character (default 0). - * @param n Number of characters in substring (default remainder). + * @param __pos Index of first character (default 0). + * @param __n Number of characters in substring (default remainder). * @return The new string. * @throw std::out_of_range If pos > size(). * - * Construct and return a new string using the @a n characters starting - * at @a pos. If the string is too short, use the remainder of the - * characters. If @a pos is beyond the end of the string, out_of_range - * is thrown. + * Construct and return a new string using the @a __n + * characters starting at @a __pos. If the string is too + * short, use the remainder of the characters. If @a __pos is + * beyond the end of the string, out_of_range is thrown. */ __versa_string substr(size_type __pos = 0, size_type __n = npos) const @@ -1840,16 +1865,17 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Compare to a string. - * @param str String to compare against. + * @param __str String to compare against. * @return Integer < 0, 0, or > 0. * - * Returns an integer < 0 if this string is ordered before @a str, 0 if - * their values are equivalent, or > 0 if this string is ordered after - * @a str. Determines the effective length rlen of the strings to - * compare as the smallest of size() and str.size(). The function - * then compares the two strings by calling traits::compare(data(), - * str.data(),rlen). If the result of the comparison is nonzero returns - * it, otherwise the shorter one is ordered first. + * Returns an integer < 0 if this string is ordered before @a + * __str, 0 if their values are equivalent, or > 0 if this + * string is ordered after @a __str. Determines the effective + * length rlen of the strings to compare as the smallest of + * size() and str.size(). The function then compares the two + * strings by calling traits::compare(data(), str.data(),rlen). + * If the result of the comparison is nonzero returns it, + * otherwise the shorter one is ordered first. */ int compare(const __versa_string& __str) const @@ -1869,20 +1895,22 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Compare substring to a string. - * @param pos Index of first character of substring. - * @param n Number of characters in substring. - * @param str String to compare against. + * @param __pos Index of first character of substring. + * @param __n Number of characters in substring. + * @param __str String to compare against. * @return Integer < 0, 0, or > 0. * - * Form the substring of this string from the @a n characters starting - * at @a pos. Returns an integer < 0 if the substring is ordered - * before @a str, 0 if their values are equivalent, or > 0 if the - * substring is ordered after @a str. Determines the effective length - * rlen of the strings to compare as the smallest of the length of the - * substring and @a str.size(). The function then compares the two - * strings by calling traits::compare(substring.data(),str.data(),rlen). - * If the result of the comparison is nonzero returns it, otherwise the - * shorter one is ordered first. + * Form the substring of this string from the @a __n characters + * starting at @a __pos. Returns an integer < 0 if the + * substring is ordered before @a __str, 0 if their values are + * equivalent, or > 0 if the substring is ordered after @a + * __str. Determines the effective length rlen of the strings + * to compare as the smallest of the length of the substring + * and @a __str.size(). The function then compares the two + * strings by calling + * traits::compare(substring.data(),str.data(),rlen). If the + * result of the comparison is nonzero returns it, otherwise + * the shorter one is ordered first. */ int compare(size_type __pos, size_type __n, @@ -1890,24 +1918,26 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Compare substring to a substring. - * @param pos1 Index of first character of substring. - * @param n1 Number of characters in substring. - * @param str String to compare against. - * @param pos2 Index of first character of substring of str. - * @param n2 Number of characters in substring of str. + * @param __pos1 Index of first character of substring. + * @param __n1 Number of characters in substring. + * @param __str String to compare against. + * @param __pos2 Index of first character of substring of str. + * @param __n2 Number of characters in substring of str. * @return Integer < 0, 0, or > 0. * - * Form the substring of this string from the @a n1 characters starting - * at @a pos1. Form the substring of @a str from the @a n2 characters - * starting at @a pos2. Returns an integer < 0 if this substring is - * ordered before the substring of @a str, 0 if their values are - * equivalent, or > 0 if this substring is ordered after the substring - * of @a str. Determines the effective length rlen of the strings - * to compare as the smallest of the lengths of the substrings. The - * function then compares the two strings by calling + * Form the substring of this string from the @a __n1 + * characters starting at @a __pos1. Form the substring of @a + * __str from the @a __n2 characters starting at @a __pos2. + * Returns an integer < 0 if this substring is ordered before + * the substring of @a __str, 0 if their values are equivalent, + * or > 0 if this substring is ordered after the substring of + * @a __str. Determines the effective length rlen of the + * strings to compare as the smallest of the lengths of the + * substrings. The function then compares the two strings by + * calling * traits::compare(substring.data(),str.substr(pos2,n2).data(),rlen). - * If the result of the comparison is nonzero returns it, otherwise the - * shorter one is ordered first. + * If the result of the comparison is nonzero returns it, + * otherwise the shorter one is ordered first. */ int compare(size_type __pos1, size_type __n1, const __versa_string& __str, @@ -1915,17 +1945,18 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Compare to a C string. - * @param s C string to compare against. + * @param __s C string to compare against. * @return Integer < 0, 0, or > 0. * - * Returns an integer < 0 if this string is ordered before @a s, 0 if - * their values are equivalent, or > 0 if this string is ordered after - * @a s. Determines the effective length rlen of the strings to - * compare as the smallest of size() and the length of a string - * constructed from @a s. The function then compares the two strings - * by calling traits::compare(data(),s,rlen). If the result of the - * comparison is nonzero returns it, otherwise the shorter one is - * ordered first. + * Returns an integer < 0 if this string is ordered before @a + * __s, 0 if their values are equivalent, or > 0 if this string + * is ordered after @a __s. Determines the effective length + * rlen of the strings to compare as the smallest of size() and + * the length of a string constructed from @a __s. The + * function then compares the two strings by calling + * traits::compare(data(),s,rlen). If the result of the + * comparison is nonzero returns it, otherwise the shorter one + * is ordered first. */ int compare(const _CharT* __s) const; @@ -1934,42 +1965,45 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) // 5 String::compare specification questionable /** * @brief Compare substring to a C string. - * @param pos Index of first character of substring. - * @param n1 Number of characters in substring. - * @param s C string to compare against. + * @param __pos Index of first character of substring. + * @param __n1 Number of characters in substring. + * @param __s C string to compare against. * @return Integer < 0, 0, or > 0. * - * Form the substring of this string from the @a n1 characters starting - * at @a pos. Returns an integer < 0 if the substring is ordered - * before @a s, 0 if their values are equivalent, or > 0 if the - * substring is ordered after @a s. Determines the effective length - * rlen of the strings to compare as the smallest of the length of the - * substring and the length of a string constructed from @a s. The + * Form the substring of this string from the @a __n1 + * characters starting at @a __pos. Returns an integer < 0 if + * the substring is ordered before @a __s, 0 if their values + * are equivalent, or > 0 if the substring is ordered after @a + * __s. Determines the effective length rlen of the strings to + * compare as the smallest of the length of the substring and + * the length of a string constructed from @a __s. The * function then compares the two string by calling - * traits::compare(substring.data(),s,rlen). If the result of the - * comparison is nonzero returns it, otherwise the shorter one is - * ordered first. + * traits::compare(substring.data(),s,rlen). If the result of + * the comparison is nonzero returns it, otherwise the shorter + * one is ordered first. */ int compare(size_type __pos, size_type __n1, const _CharT* __s) const; /** * @brief Compare substring against a character array. - * @param pos1 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. + * @param __pos1 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 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 - * is ordered after the string from @a s. Determines the 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 the comparison is nonzero returns it, otherwise the shorter + * Form the substring of this string from the @a __n1 + * characters starting at @a __pos1. 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 + * is ordered after the string from @a __s. Determines the + * 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 + * the comparison is nonzero returns it, otherwise the shorter * one is ordered first. * * NB: s must have at least n2 characters, '\0' has no special @@ -1983,9 +2017,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) // operator+ /** * @brief Concatenate two strings. - * @param lhs First string. - * @param rhs Last string. - * @return New string with value of @a lhs followed by @a rhs. + * @param __lhs First string. + * @param __rhs Last string. + * @return New string with value of @a __lhs followed by @a __rhs. */ template<typename _CharT, typename _Traits, typename _Alloc, template <typename, typename, typename> class _Base> @@ -1995,9 +2029,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Concatenate C string and string. - * @param lhs First string. - * @param rhs Last string. - * @return New string with value of @a lhs followed by @a rhs. + * @param __lhs First string. + * @param __rhs Last string. + * @return New string with value of @a __lhs followed by @a __rhs. */ template<typename _CharT, typename _Traits, typename _Alloc, template <typename, typename, typename> class _Base> @@ -2007,9 +2041,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Concatenate character and string. - * @param lhs First string. - * @param rhs Last string. - * @return New string with @a lhs followed by @a rhs. + * @param __lhs First string. + * @param __rhs Last string. + * @return New string with @a __lhs followed by @a __rhs. */ template<typename _CharT, typename _Traits, typename _Alloc, template <typename, typename, typename> class _Base> @@ -2019,9 +2053,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Concatenate string and C string. - * @param lhs First string. - * @param rhs Last string. - * @return New string with @a lhs followed by @a rhs. + * @param __lhs First string. + * @param __rhs Last string. + * @return New string with @a __lhs followed by @a __rhs. */ template<typename _CharT, typename _Traits, typename _Alloc, template <typename, typename, typename> class _Base> @@ -2031,9 +2065,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Concatenate string and character. - * @param lhs First string. - * @param rhs Last string. - * @return New string with @a lhs followed by @a rhs. + * @param __lhs First string. + * @param __rhs Last string. + * @return New string with @a __lhs followed by @a __rhs. */ template<typename _CharT, typename _Traits, typename _Alloc, template <typename, typename, typename> class _Base> @@ -2044,9 +2078,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) // operator == /** * @brief Test equivalence of two strings. - * @param lhs First string. - * @param rhs Second string. - * @return True if @a lhs.compare(@a rhs) == 0. False otherwise. + * @param __lhs First string. + * @param __rhs Second string. + * @return True if @a __lhs.compare(@a __rhs) == 0. False otherwise. */ template<typename _CharT, typename _Traits, typename _Alloc, template <typename, typename, typename> class _Base> @@ -2068,9 +2102,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Test equivalence of C string and string. - * @param lhs C string. - * @param rhs String. - * @return True if @a rhs.compare(@a lhs) == 0. False otherwise. + * @param __lhs C string. + * @param __rhs String. + * @return True if @a __rhs.compare(@a __lhs) == 0. False otherwise. */ template<typename _CharT, typename _Traits, typename _Alloc, template <typename, typename, typename> class _Base> @@ -2081,9 +2115,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Test equivalence of string and C string. - * @param lhs String. - * @param rhs C string. - * @return True if @a lhs.compare(@a rhs) == 0. False otherwise. + * @param __lhs String. + * @param __rhs C string. + * @return True if @a __lhs.compare(@a __rhs) == 0. False otherwise. */ template<typename _CharT, typename _Traits, typename _Alloc, template <typename, typename, typename> class _Base> @@ -2095,9 +2129,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) // operator != /** * @brief Test difference of two strings. - * @param lhs First string. - * @param rhs Second string. - * @return True if @a lhs.compare(@a rhs) != 0. False otherwise. + * @param __lhs First string. + * @param __rhs Second string. + * @return True if @a __lhs.compare(@a __rhs) != 0. False otherwise. */ template<typename _CharT, typename _Traits, typename _Alloc, template <typename, typename, typename> class _Base> @@ -2108,9 +2142,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Test difference of C string and string. - * @param lhs C string. - * @param rhs String. - * @return True if @a rhs.compare(@a lhs) != 0. False otherwise. + * @param __lhs C string. + * @param __rhs String. + * @return True if @a __rhs.compare(@a __lhs) != 0. False otherwise. */ template<typename _CharT, typename _Traits, typename _Alloc, template <typename, typename, typename> class _Base> @@ -2121,9 +2155,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Test difference of string and C string. - * @param lhs String. - * @param rhs C string. - * @return True if @a lhs.compare(@a rhs) != 0. False otherwise. + * @param __lhs String. + * @param __rhs C string. + * @return True if @a __lhs.compare(@a __rhs) != 0. False otherwise. */ template<typename _CharT, typename _Traits, typename _Alloc, template <typename, typename, typename> class _Base> @@ -2135,9 +2169,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) // operator < /** * @brief Test if string precedes string. - * @param lhs First string. - * @param rhs Second string. - * @return True if @a lhs precedes @a rhs. False otherwise. + * @param __lhs First string. + * @param __rhs Second string. + * @return True if @a __lhs precedes @a __rhs. False otherwise. */ template<typename _CharT, typename _Traits, typename _Alloc, template <typename, typename, typename> class _Base> @@ -2148,9 +2182,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Test if string precedes C string. - * @param lhs String. - * @param rhs C string. - * @return True if @a lhs precedes @a rhs. False otherwise. + * @param __lhs String. + * @param __rhs C string. + * @return True if @a __lhs precedes @a __rhs. False otherwise. */ template<typename _CharT, typename _Traits, typename _Alloc, template <typename, typename, typename> class _Base> @@ -2161,9 +2195,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Test if C string precedes string. - * @param lhs C string. - * @param rhs String. - * @return True if @a lhs precedes @a rhs. False otherwise. + * @param __lhs C string. + * @param __rhs String. + * @return True if @a __lhs precedes @a __rhs. False otherwise. */ template<typename _CharT, typename _Traits, typename _Alloc, template <typename, typename, typename> class _Base> @@ -2175,9 +2209,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) // operator > /** * @brief Test if string follows string. - * @param lhs First string. - * @param rhs Second string. - * @return True if @a lhs follows @a rhs. False otherwise. + * @param __lhs First string. + * @param __rhs Second string. + * @return True if @a __lhs follows @a __rhs. False otherwise. */ template<typename _CharT, typename _Traits, typename _Alloc, template <typename, typename, typename> class _Base> @@ -2188,9 +2222,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Test if string follows C string. - * @param lhs String. - * @param rhs C string. - * @return True if @a lhs follows @a rhs. False otherwise. + * @param __lhs String. + * @param __rhs C string. + * @return True if @a __lhs follows @a __rhs. False otherwise. */ template<typename _CharT, typename _Traits, typename _Alloc, template <typename, typename, typename> class _Base> @@ -2201,9 +2235,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Test if C string follows string. - * @param lhs C string. - * @param rhs String. - * @return True if @a lhs follows @a rhs. False otherwise. + * @param __lhs C string. + * @param __rhs String. + * @return True if @a __lhs follows @a __rhs. False otherwise. */ template<typename _CharT, typename _Traits, typename _Alloc, template <typename, typename, typename> class _Base> @@ -2215,9 +2249,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) // operator <= /** * @brief Test if string doesn't follow string. - * @param lhs First string. - * @param rhs Second string. - * @return True if @a lhs doesn't follow @a rhs. False otherwise. + * @param __lhs First string. + * @param __rhs Second string. + * @return True if @a __lhs doesn't follow @a __rhs. False otherwise. */ template<typename _CharT, typename _Traits, typename _Alloc, template <typename, typename, typename> class _Base> @@ -2228,9 +2262,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Test if string doesn't follow C string. - * @param lhs String. - * @param rhs C string. - * @return True if @a lhs doesn't follow @a rhs. False otherwise. + * @param __lhs String. + * @param __rhs C string. + * @return True if @a __lhs doesn't follow @a __rhs. False otherwise. */ template<typename _CharT, typename _Traits, typename _Alloc, template <typename, typename, typename> class _Base> @@ -2241,9 +2275,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Test if C string doesn't follow string. - * @param lhs C string. - * @param rhs String. - * @return True if @a lhs doesn't follow @a rhs. False otherwise. + * @param __lhs C string. + * @param __rhs String. + * @return True if @a __lhs doesn't follow @a __rhs. False otherwise. */ template<typename _CharT, typename _Traits, typename _Alloc, template <typename, typename, typename> class _Base> @@ -2255,9 +2289,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) // operator >= /** * @brief Test if string doesn't precede string. - * @param lhs First string. - * @param rhs Second string. - * @return True if @a lhs doesn't precede @a rhs. False otherwise. + * @param __lhs First string. + * @param __rhs Second string. + * @return True if @a __lhs doesn't precede @a __rhs. False otherwise. */ template<typename _CharT, typename _Traits, typename _Alloc, template <typename, typename, typename> class _Base> @@ -2268,9 +2302,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Test if string doesn't precede C string. - * @param lhs String. - * @param rhs C string. - * @return True if @a lhs doesn't precede @a rhs. False otherwise. + * @param __lhs String. + * @param __rhs C string. + * @return True if @a __lhs doesn't precede @a __rhs. False otherwise. */ template<typename _CharT, typename _Traits, typename _Alloc, template <typename, typename, typename> class _Base> @@ -2281,9 +2315,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Test if C string doesn't precede string. - * @param lhs C string. - * @param rhs String. - * @return True if @a lhs doesn't precede @a rhs. False otherwise. + * @param __lhs C string. + * @param __rhs String. + * @return True if @a __lhs doesn't precede @a __rhs. False otherwise. */ template<typename _CharT, typename _Traits, typename _Alloc, template <typename, typename, typename> class _Base> @@ -2294,10 +2328,10 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) /** * @brief Swap contents of two strings. - * @param lhs First string. - * @param rhs Second string. + * @param __lhs First string. + * @param __rhs Second string. * - * Exchanges the contents of @a lhs and @a rhs in constant time. + * Exchanges the contents of @a __lhs and @a __rhs in constant time. */ template<typename _CharT, typename _Traits, typename _Alloc, template <typename, typename, typename> class _Base> @@ -2328,14 +2362,15 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Read stream into a string. - * @param is Input stream. - * @param str Buffer to store into. + * @param __is Input stream. + * @param __str Buffer to store into. * @return Reference to the input stream. * - * Stores characters from @a is into @a str until whitespace is found, the - * end of the stream is encountered, or str.max_size() is reached. If - * is.width() is non-zero, that is the limit on the number of characters - * stored into @a str. Any previous contents of @a str are erased. + * Stores characters from @a __is into @a __str until whitespace is + * found, the end of the stream is encountered, or str.max_size() + * is reached. If is.width() is non-zero, that is the limit on the + * number of characters stored into @a __str. Any previous + * contents of @a __str are erased. */ template<typename _CharT, typename _Traits, typename _Alloc, template <typename, typename, typename> class _Base> @@ -2346,11 +2381,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Write string to a stream. - * @param os Output stream. - * @param str String to write out. + * @param __os Output stream. + * @param __str String to write out. * @return Reference to the output stream. * - * Output characters of @a str into os following the same rules as for + * Output characters of @a __str into os following the same rules as for * writing a C string. */ template<typename _CharT, typename _Traits, typename _Alloc, @@ -2367,16 +2402,17 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Read a line from stream into a string. - * @param is Input stream. - * @param str Buffer to store into. - * @param delim Character marking end of line. + * @param __is Input stream. + * @param __str Buffer to store into. + * @param __delim Character marking end of line. * @return Reference to the input stream. * - * Stores characters from @a is into @a str until @a delim is found, the - * end of the stream is encountered, or str.max_size() is reached. If - * is.width() is non-zero, that is the limit on the number of characters - * stored into @a str. Any previous contents of @a str are erased. If @a - * delim was encountered, it is extracted but not stored into @a str. + * Stores characters from @a __is into @a __str until @a __delim is + * found, the end of the stream is encountered, or str.max_size() + * is reached. If is.width() is non-zero, that is the limit on the + * number of characters stored into @a __str. Any previous + * contents of @a __str are erased. If @a delim was encountered, + * it is extracted but not stored into @a __str. */ template<typename _CharT, typename _Traits, typename _Alloc, template <typename, typename, typename> class _Base> @@ -2387,15 +2423,16 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** * @brief Read a line from stream into a string. - * @param is Input stream. - * @param str Buffer to store into. + * @param __is Input stream. + * @param __str Buffer to store into. * @return Reference to the input stream. * - * Stores characters from is into @a str until '\n' is found, the end of - * the stream is encountered, or str.max_size() is reached. If is.width() - * is non-zero, that is the limit on the number of characters stored into - * @a str. Any previous contents of @a str are erased. If end of line was - * encountered, it is extracted but not stored into @a str. + * Stores characters from is into @a __str until '\n' is found, the + * end of the stream is encountered, or str.max_size() is reached. + * If is.width() is non-zero, that is the limit on the number of + * characters stored into @a __str. Any previous contents of @a + * __str are erased. If end of line was encountered, it is + * extracted but not stored into @a __str. */ template<typename _CharT, typename _Traits, typename _Alloc, template <typename, typename, typename> class _Base> diff --git a/libstdc++-v3/include/std/chrono b/libstdc++-v3/include/std/chrono index 76dc93ce674..7602d71404a 100644 --- a/libstdc++-v3/include/std/chrono +++ b/libstdc++-v3/include/std/chrono @@ -1,6 +1,6 @@ // <chrono> -*- C++ -*- -// Copyright (C) 2008 Free Software Foundation, Inc. +// Copyright (C) 2008, 2009 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 @@ -53,6 +53,17 @@ namespace std { + /** + * @defgroup chrono Time + * @ingroup utilities + * + * Classes and functions for time. + * @{ + */ + + /** @namespace std::chrono + * @brief ISO C++ 0x entities sub namespace for time and date. + */ namespace chrono { template<typename _Rep, typename _Period = ratio<1>> @@ -84,7 +95,7 @@ namespace std namespace chrono { - // primary template for duration_cast impl. + // Primary template for duration_cast impl. template<typename _ToDuration, typename _CF, typename _CR, bool _NumIsOne = false, bool _DenIsOne = false> struct __duration_cast_impl @@ -132,6 +143,7 @@ namespace std } }; + /// duration_cast template<typename _ToDuration, typename _Rep, typename _Period> inline _ToDuration duration_cast(const duration<_Rep, _Period>& __d) @@ -145,11 +157,13 @@ namespace std __cf::num == 1, __cf::den == 1>::__cast(__d); } + /// treat_as_floating_point template<typename _Rep> struct treat_as_floating_point : is_floating_point<_Rep> { }; + /// duration_values template<typename _Rep> struct duration_values { @@ -433,11 +447,22 @@ namespace std const duration<_Rep2, _Period2>& __rhs) { return !(__lhs < __rhs); } + /// nanoseconds typedef duration<int64_t, nano> nanoseconds; + + /// microseconds typedef duration<int64_t, micro> microseconds; + + /// milliseconds typedef duration<int64_t, milli> milliseconds; + + /// seconds typedef duration<int64_t > seconds; + + /// minutes typedef duration<int, ratio< 60>> minutes; + + /// hours typedef duration<int, ratio<3600>> hours; /// time_point @@ -496,6 +521,7 @@ namespace std duration __d; }; + /// time_point_cast template<typename _ToDuration, typename _Clock, typename _Duration> inline time_point<_Clock, _ToDuration> time_point_cast(const time_point<_Clock, _Duration>& __t) @@ -621,6 +647,7 @@ namespace std }; #ifdef _GLIBCXX_USE_CLOCK_MONOTONIC + /// monotonic_clock struct monotonic_clock { typedef chrono::nanoseconds duration; @@ -638,8 +665,10 @@ namespace std #endif typedef system_clock high_resolution_clock; - } -} + } // namespace chrono + + // @} group chrono +} // namespace std #endif //_GLIBCXX_USE_C99_STDINT_TR1 diff --git a/libstdc++-v3/include/std/complex b/libstdc++-v3/include/std/complex index 1c48251e350..ebde1a0a232 100644 --- a/libstdc++-v3/include/std/complex +++ b/libstdc++-v3/include/std/complex @@ -1,7 +1,7 @@ // The template and inlines for the -*- C++ -*- complex number classes. // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -// 2006, 2007, 2008 +// 2006, 2007, 2008, 2009 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -53,6 +53,14 @@ _GLIBCXX_BEGIN_NAMESPACE(std) + /** + * @defgroup complex_numbers Complex Numbers + * @ingroup numerics + * + * Classes and functions for complex numbers. + * @{ + */ + // Forward declarations. template<typename _Tp> class complex; template<> class complex<float>; @@ -104,7 +112,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std) template<typename _Tp> complex<_Tp> tan(const complex<_Tp>&); /// Return complex hyperbolic tangent of @a z. template<typename _Tp> complex<_Tp> tanh(const complex<_Tp>&); - //@} // 26.2.2 Primary template class complex @@ -1448,8 +1455,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // These bits have to be at the end of this file, so that the // specializations have all been defined. - // ??? No, they have to be there because of compiler limitation at - // inlining. It suffices that class specializations be defined. inline complex<float>::complex(const complex<double>& __z) : _M_value(__z.__rep()) { } @@ -1483,6 +1488,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) #endif #endif + // @} group complex_numbers + _GLIBCXX_END_NAMESPACE _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) diff --git a/libstdc++-v3/include/std/condition_variable b/libstdc++-v3/include/std/condition_variable index c26c213e618..85687cab44c 100644 --- a/libstdc++-v3/include/std/condition_variable +++ b/libstdc++-v3/include/std/condition_variable @@ -47,6 +47,14 @@ namespace std { + /** + * @defgroup condition_variables Condition Variables + * @ingroup concurrency + * + * Classes for condition_variable support. + * @{ + */ + /// condition_variable class condition_variable { @@ -211,6 +219,8 @@ namespace std native_handle() { return &_M_cond; } }; + + // @} group condition_variables } #endif // _GLIBCXX_HAS_GTHREADS && _GLIBCXX_USE_C99_STDINT_TR1 diff --git a/libstdc++-v3/include/std/fstream b/libstdc++-v3/include/std/fstream index 46b630702a9..097d5769fa2 100644 --- a/libstdc++-v3/include/std/fstream +++ b/libstdc++-v3/include/std/fstream @@ -1,7 +1,7 @@ // File based streams -*- C++ -*- // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -// 2006, 2007, 2008 +// 2006, 2007, 2008, 2009 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -53,6 +53,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // [27.8.1.1] template class basic_filebuf /** * @brief The actual work of input and output (for files). + * @ingroup io * * This class associates both its input and output sequence with an * external disk file, and maintains a joint file position for both @@ -392,6 +393,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // [27.8.1.5] Template class basic_ifstream /** * @brief Controlling input for files. + * @ingroup io * * This class supports reading from named files, using the inherited * functions from std::basic_istream. To control the associated @@ -520,6 +522,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // [27.8.1.8] Template class basic_ofstream /** * @brief Controlling output for files. + * @ingroup io * * This class supports reading from named files, using the inherited * functions from std::basic_ostream. To control the associated @@ -651,6 +654,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // [27.8.1.11] Template class basic_fstream /** * @brief Controlling input and output for files. + * @ingroup io * * This class supports reading from and writing to named files, using * the inherited functions from std::basic_iostream. To control the diff --git a/libstdc++-v3/include/std/istream b/libstdc++-v3/include/std/istream index 8b87c73fc1b..d59afe67928 100644 --- a/libstdc++-v3/include/std/istream +++ b/libstdc++-v3/include/std/istream @@ -1,7 +1,7 @@ // Input streams -*- C++ -*- // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -// 2006, 2007, 2008 +// 2006, 2007, 2008, 2009 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -50,6 +50,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // [27.6.1.1] Template class basic_istream /** * @brief Controlling input. + * @ingroup io * * This is the base class for all input streams. It provides text * formatting of all builtin types, and communicates with any class @@ -758,6 +759,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // 27.6.1.5 Template class basic_iostream /** * @brief Merging istream and ostream capabilities. + * @ingroup io * * This class multiply inherits from the input and output stream classes * simply to provide a single interface. diff --git a/libstdc++-v3/include/std/memory b/libstdc++-v3/include/std/memory index 045477ec8cc..1ee4031ff17 100644 --- a/libstdc++-v3/include/std/memory +++ b/libstdc++-v3/include/std/memory @@ -1,6 +1,6 @@ // <memory> -*- C++ -*- -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -95,4 +95,11 @@ # include <backward/auto_ptr.h> #endif +/** + * @defgroup memory Memory + * @ingroup utilities + * + * Components for memory allocation, deallocation, and management. + */ + #endif /* _GLIBCXX_MEMORY */ diff --git a/libstdc++-v3/include/std/mutex b/libstdc++-v3/include/std/mutex index bdd5193f4d0..6d6475d8c12 100644 --- a/libstdc++-v3/include/std/mutex +++ b/libstdc++-v3/include/std/mutex @@ -56,6 +56,14 @@ namespace std { + /** + * @defgroup mutexes Mutexes + * @ingroup concurrency + * + * Classes for mutex support. + * @{ + */ + /// mutex class mutex { @@ -383,7 +391,11 @@ namespace std extern const try_to_lock_t try_to_lock; extern const adopt_lock_t adopt_lock; - /// Thrown to indicate errors with lock operations. + /** + * @brief Thrown to indicate errors with lock operations. + * + * @ingroup exceptions + */ class lock_error : public exception { public: @@ -682,6 +694,7 @@ namespace std return __try_lock_impl<0>::__do_try_lock(__locks); } + /// lock template<typename _L1, typename _L2, typename ..._L3> void lock(_L1&, _L2&, _L3&...); @@ -727,6 +740,7 @@ namespace std extern "C" void __once_proxy(); + /// call_once template<typename _Callable, typename... _Args> void call_once(once_flag& __once, _Callable __f, _Args&&... __args) @@ -751,6 +765,8 @@ namespace std if (__e) __throw_system_error(__e); } + + // @} group mutexes } #endif // _GLIBCXX_HAS_GTHREADS && _GLIBCXX_USE_C99_STDINT_TR1 diff --git a/libstdc++-v3/include/std/ostream b/libstdc++-v3/include/std/ostream index 93a7d6ede31..092f7048d87 100644 --- a/libstdc++-v3/include/std/ostream +++ b/libstdc++-v3/include/std/ostream @@ -1,7 +1,7 @@ // Output streams -*- C++ -*- // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -// 2006, 2007, 2008 +// 2006, 2007, 2008, 2009 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -50,6 +50,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // [27.6.2.1] Template class basic_ostream /** * @brief Controlling output. + * @ingroup io * * This is the base class for all output streams. It provides text * formatting of all builtin types, and communicates with any class diff --git a/libstdc++-v3/include/std/ratio b/libstdc++-v3/include/std/ratio index 124e9af397a..5f6af6b0f1f 100644 --- a/libstdc++-v3/include/std/ratio +++ b/libstdc++-v3/include/std/ratio @@ -1,6 +1,6 @@ -// <ratio> -*- C++ -*- +// ratio -*- C++ -*- -// Copyright (C) 2008 Free Software Foundation, Inc. +// Copyright (C) 2008, 2009 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 @@ -47,6 +47,14 @@ namespace std { + /** + * @defgroup ratio Rational Arithmetic + * @ingroup utilities + * + * Compile time representation of fininte rational numbers. + * @{ + */ + template<intmax_t _Pn> struct __static_sign : integral_constant<intmax_t, (_Pn < 0) ? -1 : 1> @@ -132,7 +140,7 @@ namespace std /** * @brief Provides compile-time rational arithmetic. - * + * * This class template represents any finite rational number with a * numerator and denominator representable by compile-time constants of * type intmax_t. The ratio is simplified when instantiated. @@ -289,6 +297,8 @@ namespace std typedef ratio< 1000000000000, 1> tera; typedef ratio< 1000000000000000, 1> peta; typedef ratio< 1000000000000000000, 1> exa; + + // @} group ratio } #endif //_GLIBCXX_USE_C99_STDINT_TR1 diff --git a/libstdc++-v3/include/std/sstream b/libstdc++-v3/include/std/sstream index 6d3366bbfd2..400760a8d31 100644 --- a/libstdc++-v3/include/std/sstream +++ b/libstdc++-v3/include/std/sstream @@ -1,7 +1,7 @@ // String based streams -*- C++ -*- // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -// 2006, 2008 Free Software Foundation, Inc. +// 2006, 2008, 2009 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 @@ -49,6 +49,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // [27.7.1] template class basic_stringbuf /** * @brief The actual work of input and output (for std::string). + * @ingroup io * * This class associates either or both of its input and output sequences * with a sequence of characters, which can be initialized from, or made @@ -249,6 +250,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // [27.7.2] Template class basic_istringstream /** * @brief Controlling input for std::string. + * @ingroup io * * This class supports reading from objects of type std::basic_string, * using the inherited functions from std::basic_istream. To control @@ -358,6 +360,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // [27.7.3] Template class basic_ostringstream /** * @brief Controlling output for std::string. + * @ingroup io * * This class supports writing to objects of type std::basic_string, * using the inherited functions from std::basic_ostream. To control @@ -467,6 +470,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // [27.7.4] Template class basic_stringstream /** * @brief Controlling input and output for std::string. + * @ingroup io * * This class supports reading from and writing to objects of type * std::basic_string, using the inherited functions from diff --git a/libstdc++-v3/include/std/stdexcept b/libstdc++-v3/include/std/stdexcept index f8e74102b9b..b1500fb1da7 100644 --- a/libstdc++-v3/include/std/stdexcept +++ b/libstdc++-v3/include/std/stdexcept @@ -1,6 +1,6 @@ // Standard exception classes -*- C++ -*- -// Copyright (C) 2001, 2002, 2005, 2007 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2005, 2007, 2009 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 @@ -45,6 +45,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std) + /** + * @addtogroup exceptions + * @{ + */ + /** Logic errors represent problems in the internal logic of a program; * in theory, these are preventable, and even detectable before the * program runs (e.g., violations of class invariants). @@ -143,6 +148,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) explicit underflow_error(const string& __arg); }; + // @} group exceptions + _GLIBCXX_END_NAMESPACE #endif /* _GLIBCXX_STDEXCEPT */ diff --git a/libstdc++-v3/include/std/system_error b/libstdc++-v3/include/std/system_error index 486c3e697a9..940ea7cadb7 100644 --- a/libstdc++-v3/include/std/system_error +++ b/libstdc++-v3/include/std/system_error @@ -318,7 +318,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std) { return !(__lhs == __rhs); } - /// Thrown to indicate error code of underlying system. + /** + * @brief Thrown to indicate error code of underlying system. + * + * @ingroup exceptions + */ class system_error : public std::runtime_error { private: diff --git a/libstdc++-v3/include/std/thread b/libstdc++-v3/include/std/thread index 8f00489262c..f2e5fc3ba62 100644 --- a/libstdc++-v3/include/std/thread +++ b/libstdc++-v3/include/std/thread @@ -53,6 +53,14 @@ namespace std { + /** + * @defgroup threads Threads + * @ingroup concurrency + * + * Classes for thread support. + * @{ + */ + /// thread class thread { @@ -225,7 +233,10 @@ namespace std return __out << __id._M_thread; } - // 30.2.2 Namespace this_thread. + /** @namespace std::this_thread + * @brief ISO C++ 0x entities sub namespace for thread. + * 30.2.2 Namespace this_thread. + */ namespace this_thread { /// get_id @@ -267,6 +278,8 @@ namespace std } #endif } + + // @} group threads } #endif // _GLIBCXX_HAS_GTHREADS && _GLIBCXX_USE_C99_STDINT_TR1 diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits index 87fdff146bc..132a92459e3 100644 --- a/libstdc++-v3/include/std/type_traits +++ b/libstdc++-v3/include/std/type_traits @@ -1,6 +1,6 @@ -// <type_traits> -*- C++ -*- +// C++0x type_traits -*- C++ -*- -// Copyright (C) 2007, 2008 Free Software Foundation, Inc. +// Copyright (C) 2007, 2008, 2009 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 @@ -62,6 +62,10 @@ namespace std { + /** @addtogroup metaprogramming + * @{ + */ + // Primary classification traits. /// is_lvalue_reference @@ -314,25 +318,26 @@ namespace std // Define a nested type if some predicate holds. - /// Primary template. + // Primary template. + /// enable_if template<bool, typename _Tp = void> struct enable_if { }; - /// Partial specialization for true. + // Partial specialization for true. template<typename _Tp> struct enable_if<true, _Tp> { typedef _Tp type; }; - // A conditional expression, but for types. - // If true, first, if false, second. - /// Primary template. + // A conditional expression, but for types. If true, first, if false, second. + // Primary template. + /// conditional template<bool _Cond, typename _Iftrue, typename _Iffalse> struct conditional { typedef _Iftrue type; }; - /// Partial specialization for false. + // Partial specialization for false. template<typename _Iftrue, typename _Iffalse> struct conditional<false, _Iftrue, _Iffalse> { typedef _Iffalse type; }; @@ -471,7 +476,8 @@ namespace std // Given an integral/enum type, return the corresponding unsigned // integer type. - /// Primary template. + // Primary template. + /// make_unsigned template<typename _Tp> struct make_unsigned { typedef typename __make_unsigned_selector<_Tp>::__type type; }; @@ -549,7 +555,8 @@ namespace std // Given an integral/enum type, return the corresponding signed // integer type. - /// Primary template. + // Primary template. + /// make_signed template<typename _Tp> struct make_signed { typedef typename __make_signed_selector<_Tp>::__type type; }; @@ -558,6 +565,7 @@ namespace std template<> struct make_signed<bool>; + /// common_type template<typename... _Tp> struct common_type; @@ -592,6 +600,8 @@ namespace std typedef typename common_type<typename common_type<_Tp, _Up>::type, _Vp...>::type type; }; + + // @} group metaprogramming } #endif // __GXX_EXPERIMENTAL_CXX0X__ diff --git a/libstdc++-v3/include/std/valarray b/libstdc++-v3/include/std/valarray index b0fa5124805..bfeae8e7809 100644 --- a/libstdc++-v3/include/std/valarray +++ b/libstdc++-v3/include/std/valarray @@ -1,7 +1,7 @@ // The template and inlines for the -*- C++ -*- valarray class. // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -// 2006, 2007 +// 2006, 2007, 2009 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -95,6 +95,14 @@ _GLIBCXX_END_NAMESPACE _GLIBCXX_BEGIN_NAMESPACE(std) /** + * @defgroup numeric_arrays Numeric Arrays + * @ingroup numerics + * + * Classes and functions for representing and manipulating arrays of elements. + * @{ + */ + + /** * @brief Smart array designed to support numeric processing. * * A valarray is an array that provides constraints intended to allow for @@ -552,6 +560,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) return _M_data[__i]; } + // @} group numeric_arrays + _GLIBCXX_END_NAMESPACE #include <bits/valarray_after.h> @@ -563,6 +573,11 @@ _GLIBCXX_END_NAMESPACE _GLIBCXX_BEGIN_NAMESPACE(std) + /** + * @addtogroup numeric_arrays + * @{ + */ + template<typename _Tp> inline valarray<_Tp>::valarray() : _M_size(0), _M_data(0) {} @@ -1069,6 +1084,8 @@ _DEFINE_BINARY_OPERATOR(>=, __greater_equal) #undef _DEFINE_BINARY_OPERATOR + // @} group numeric_arrays + _GLIBCXX_END_NAMESPACE #endif /* _GLIBCXX_VALARRAY */ diff --git a/libstdc++-v3/include/tr1_impl/array b/libstdc++-v3/include/tr1_impl/array index a9781156a8a..e4112c73a78 100644 --- a/libstdc++-v3/include/tr1_impl/array +++ b/libstdc++-v3/include/tr1_impl/array @@ -39,7 +39,6 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1 /** * @brief A standard container for storing a fixed size sequence of elements. * - * @ingroup containers * @ingroup sequences * * Meets the requirements of a <a href="tables.html#65">container</a>, a diff --git a/libstdc++-v3/include/tr1_impl/complex b/libstdc++-v3/include/tr1_impl/complex index 46560deaa4b..6178165f9fd 100644 --- a/libstdc++-v3/include/tr1_impl/complex +++ b/libstdc++-v3/include/tr1_impl/complex @@ -1,6 +1,6 @@ // TR1 complex -*- C++ -*- -// Copyright (C) 2007, 2008 Free Software Foundation, Inc. +// Copyright (C) 2007, 2008, 2009 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 @@ -36,6 +36,11 @@ namespace std { _GLIBCXX_BEGIN_NAMESPACE_TR1 + /** + * @addtogroup complex_numbers + * @{ + */ + // Forward declarations. template<typename _Tp> std::complex<_Tp> acos(const std::complex<_Tp>&); template<typename _Tp> std::complex<_Tp> asin(const std::complex<_Tp>&); @@ -51,9 +56,6 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1 template<typename _Tp> std::complex<_Tp> fabs(const std::complex<_Tp>&); #endif - /// acos(__z) [8.1.2]. - // Effects: Behaves the same as C99 function cacos, defined - // in subclause 7.3.5.1. template<typename _Tp> inline std::complex<_Tp> __complex_acos(const std::complex<_Tp>& __z) @@ -81,15 +83,15 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1 acos(const std::complex<_Tp>& __z) { return __complex_acos(__z.__rep()); } #else + /// acos(__z) [8.1.2]. + // Effects: Behaves the same as C99 function cacos, defined + // in subclause 7.3.5.1. template<typename _Tp> inline std::complex<_Tp> acos(const std::complex<_Tp>& __z) { return __complex_acos(__z); } #endif - /// asin(__z) [8.1.3]. - // Effects: Behaves the same as C99 function casin, defined - // in subclause 7.3.5.2. template<typename _Tp> inline std::complex<_Tp> __complex_asin(const std::complex<_Tp>& __z) @@ -117,15 +119,15 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1 asin(const std::complex<_Tp>& __z) { return __complex_asin(__z.__rep()); } #else + /// asin(__z) [8.1.3]. + // Effects: Behaves the same as C99 function casin, defined + // in subclause 7.3.5.2. template<typename _Tp> inline std::complex<_Tp> asin(const std::complex<_Tp>& __z) { return __complex_asin(__z); } #endif - /// atan(__z) [8.1.4]. - // Effects: Behaves the same as C99 function catan, defined - // in subclause 7.3.5.3. template<typename _Tp> std::complex<_Tp> __complex_atan(const std::complex<_Tp>& __z) @@ -161,15 +163,15 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1 atan(const std::complex<_Tp>& __z) { return __complex_atan(__z.__rep()); } #else + /// atan(__z) [8.1.4]. + // Effects: Behaves the same as C99 function catan, defined + // in subclause 7.3.5.3. template<typename _Tp> inline std::complex<_Tp> atan(const std::complex<_Tp>& __z) { return __complex_atan(__z); } #endif - /// acosh(__z) [8.1.5]. - // Effects: Behaves the same as C99 function cacosh, defined - // in subclause 7.3.6.1. template<typename _Tp> std::complex<_Tp> __complex_acosh(const std::complex<_Tp>& __z) @@ -200,15 +202,15 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1 acosh(const std::complex<_Tp>& __z) { return __complex_acosh(__z.__rep()); } #else + /// acosh(__z) [8.1.5]. + // Effects: Behaves the same as C99 function cacosh, defined + // in subclause 7.3.6.1. template<typename _Tp> inline std::complex<_Tp> acosh(const std::complex<_Tp>& __z) { return __complex_acosh(__z); } #endif - /// asinh(__z) [8.1.6]. - // Effects: Behaves the same as C99 function casin, defined - // in subclause 7.3.6.2. template<typename _Tp> std::complex<_Tp> __complex_asinh(const std::complex<_Tp>& __z) @@ -239,15 +241,15 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1 asinh(const std::complex<_Tp>& __z) { return __complex_asinh(__z.__rep()); } #else + /// asinh(__z) [8.1.6]. + // Effects: Behaves the same as C99 function casin, defined + // in subclause 7.3.6.2. template<typename _Tp> inline std::complex<_Tp> asinh(const std::complex<_Tp>& __z) { return __complex_asinh(__z); } #endif - /// atanh(__z) [8.1.7]. - // Effects: Behaves the same as C99 function catanh, defined - // in subclause 7.3.6.3. template<typename _Tp> std::complex<_Tp> __complex_atanh(const std::complex<_Tp>& __z) @@ -283,21 +285,24 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1 atanh(const std::complex<_Tp>& __z) { return __complex_atanh(__z.__rep()); } #else + /// atanh(__z) [8.1.7]. + // Effects: Behaves the same as C99 function catanh, defined + // in subclause 7.3.6.3. template<typename _Tp> inline std::complex<_Tp> atanh(const std::complex<_Tp>& __z) { return __complex_atanh(__z); } #endif - /// fabs(__z) [8.1.8]. - // Effects: Behaves the same as C99 function cabs, defined - // in subclause 7.3.8.1. template<typename _Tp> #ifdef _GLIBCXX_INCLUDE_AS_CXX0X inline _Tp #else inline std::complex<_Tp> #endif + /// fabs(__z) [8.1.8]. + // Effects: Behaves the same as C99 function cabs, defined + // in subclause 7.3.8.1. fabs(const std::complex<_Tp>& __z) { return std::abs(__z); } @@ -364,5 +369,7 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1 std::complex<__type>(__y)); } + // @} group complex_numbers + _GLIBCXX_END_NAMESPACE_TR1 } diff --git a/libstdc++-v3/include/tr1_impl/functional b/libstdc++-v3/include/tr1_impl/functional index f3d843c9d8c..7cf6ac98c34 100644 --- a/libstdc++-v3/include/tr1_impl/functional +++ b/libstdc++-v3/include/tr1_impl/functional @@ -1,6 +1,6 @@ // TR1 functional header -*- C++ -*- -// Copyright (C) 2007, 2008 Free Software Foundation, Inc. +// Copyright (C) 2007, 2008, 2009 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 @@ -827,9 +827,13 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1 /// The type of placeholder objects defined by libstdc++. template<int _Num> struct _Placeholder { }; - // Define a large number of placeholders. There is no way to - // simplify this with variadic templates, because we're introducing - // unique names for each. + /** @namespace std::placeholders + * @brief ISO C++ 0x entities sub namespace for functional. + * + * Define a large number of placeholders. There is no way to + * simplify this with variadic templates, because we're introducing + * unique names for each. + */ namespace placeholders { namespace diff --git a/libstdc++-v3/include/tr1_impl/regex b/libstdc++-v3/include/tr1_impl/regex index 80bc394e96d..0126ee988a2 100644 --- a/libstdc++-v3/include/tr1_impl/regex +++ b/libstdc++-v3/include/tr1_impl/regex @@ -40,11 +40,14 @@ namespace std _GLIBCXX_BEGIN_NAMESPACE_TR1 /** - * @addtogroup tr1_regex Regular Expressions + * @defgroup tr1_regex Regular Expressions * A facility for performing regular expression pattern matching. */ //@{ +/** @namespace std::regex_constants + * @brief ISO C++ 0x entities sub namespace for regex. + */ namespace regex_constants { /** @@ -387,9 +390,10 @@ namespace regex_constants // [7.8] Class regex_error /** - * @brief A regular expression exception class. + * @brief A regular expression exception class. + * @ingroup exceptions * - * The regular expression library throws objects of this class on error. + * The regular expression library throws objects of this class on error. */ class regex_error : public std::runtime_error @@ -2703,7 +2707,7 @@ namespace regex_constants typedef regex_token_iterator<wstring::const_iterator> wsregex_token_iterator; #endif - //@} // group tr1_regex + //@} _GLIBCXX_END_NAMESPACE_TR1 } diff --git a/libstdc++-v3/include/tr1_impl/type_traits b/libstdc++-v3/include/tr1_impl/type_traits index e3b6af51bdc..cb0ad44a5ff 100644 --- a/libstdc++-v3/include/tr1_impl/type_traits +++ b/libstdc++-v3/include/tr1_impl/type_traits @@ -1,6 +1,6 @@ // TR1 type_traits -*- C++ -*- -// Copyright (C) 2007, 2008 Free Software Foundation, Inc. +// Copyright (C) 2007, 2008, 2009 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 @@ -36,6 +36,14 @@ namespace std { _GLIBCXX_BEGIN_NAMESPACE_TR1 + /** + * @defgroup metaprogramming Type Traits + * @ingroup utilities + * + * Compile time type transformation and information. + * @{ + */ + // For use in __is_convertible_simple. struct __sfinae_types { @@ -57,7 +65,9 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1 struct _Trait<_Type> \ : public integral_constant<bool, _Value> { }; - /// helper classes [4.3]. + // helper classes [4.3]. + + /// integral_constant template<typename _Tp, _Tp __v> struct integral_constant { @@ -75,6 +85,7 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1 template<typename _Tp, _Tp __v> const _Tp integral_constant<_Tp, __v>::value; + /// remove_cv template<typename> struct remove_cv; @@ -83,7 +94,9 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1 : public false_type { }; _DEFINE_SPEC(0, __is_void_helper, void, true) - /// primary type categories [4.5.1]. + // primary type categories [4.5.1]. + + /// is_void template<typename _Tp> struct is_void : public integral_constant<bool, (__is_void_helper<typename @@ -230,7 +243,9 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1 remove_cv<_Tp>::type>::value)> { }; - /// composite type traits [4.5.2]. + // composite type traits [4.5.2]. + + /// is_arithmetic template<typename _Tp> struct is_arithmetic : public integral_constant<bool, (is_integral<_Tp>::value @@ -278,12 +293,12 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1 || is_member_function_pointer<_Tp>::value)> { }; - /// type properties [4.5.3]. + // type properties [4.5.3]. + /// is_const template<typename> struct is_const : public false_type { }; - /// is_const template<typename _Tp> struct is_const<_Tp const> : public true_type { }; @@ -358,7 +373,9 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1 _Uint - 1>::value> { }; - /// relationships between types [4.6]. + // relationships between types [4.6]. + + /// is_same template<typename, typename> struct is_same : public false_type { }; @@ -367,7 +384,9 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1 struct is_same<_Tp, _Tp> : public true_type { }; - /// const-volatile modifications [4.7.1]. + // const-volatile modifications [4.7.1]. + + /// remove_const template<typename _Tp> struct remove_const { typedef _Tp type; }; @@ -411,7 +430,9 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1 add_const<typename add_volatile<_Tp>::type>::type type; }; - /// array modifications [4.7.3]. + // array modifications [4.7.3]. + + /// remove_extent template<typename _Tp> struct remove_extent { typedef _Tp type; }; @@ -437,7 +458,8 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1 struct remove_all_extents<_Tp[]> { typedef typename remove_all_extents<_Tp>::type type; }; - /// pointer modifications [4.7.4]. + // pointer modifications [4.7.4]. + template<typename _Tp, typename> struct __remove_pointer_helper { typedef _Tp type; }; @@ -465,5 +487,6 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1 #undef _DEFINE_SPEC_2_HELPER #undef _DEFINE_SPEC + // @} group metaprogramming _GLIBCXX_END_NAMESPACE_TR1 } diff --git a/libstdc++-v3/include/tr1_impl/unordered_map b/libstdc++-v3/include/tr1_impl/unordered_map index c16d0fa5701..a917b4d57ee 100644 --- a/libstdc++-v3/include/tr1_impl/unordered_map +++ b/libstdc++-v3/include/tr1_impl/unordered_map @@ -173,7 +173,6 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1 * at most one of each key value) that associates values of another type * with the keys. * - * @ingroup containers * @ingroup unordered_associative_containers * * Meets the requirements of a <a href="tables.html#65">container</a>, and @@ -256,7 +255,6 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1 * (possibly containing multiple of each key value) that associates * values of another type with the keys. * - * @ingroup containers * @ingroup unordered_associative_containers * * Meets the requirements of a <a href="tables.html#65">container</a>, and diff --git a/libstdc++-v3/include/tr1_impl/unordered_set b/libstdc++-v3/include/tr1_impl/unordered_set index 8008d0f63d1..742b88791c2 100644 --- a/libstdc++-v3/include/tr1_impl/unordered_set +++ b/libstdc++-v3/include/tr1_impl/unordered_set @@ -169,7 +169,6 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1 * at most one of each key value) in which the elements' keys are * the elements themselves. * - * @ingroup containers * @ingroup unordered_associative_containers * * Meets the requirements of a <a href="tables.html#65">container</a>, and @@ -249,7 +248,6 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1 * (possibly containing multiple of each key value) in which the * elements' keys are the elements themselves. * - * @ingroup containers * @ingroup unordered_associative_containers * * Meets the requirements of a <a href="tables.html#65">container</a>, and diff --git a/libstdc++-v3/libsupc++/cxxabi-forced.h b/libstdc++-v3/libsupc++/cxxabi-forced.h index 523ccba01a6..7d6df1b79cf 100644 --- a/libstdc++-v3/libsupc++/cxxabi-forced.h +++ b/libstdc++-v3/libsupc++/cxxabi-forced.h @@ -1,6 +1,6 @@ // cxxabi.h subset for inclusion by other library headers -*- C++ -*- -// Copyright (C) 2007 Free Software Foundation, Inc. +// Copyright (C) 2007, 2009 Free Software Foundation, Inc. // // This file is part of GCC. // @@ -36,8 +36,13 @@ #ifdef __cplusplus namespace __cxxabiv1 { - // A magic placeholder class that can be caught by reference - // to recognize forced unwinding. + /** + * @brief Thrown as part of forced unwinding. + * @ingroup exceptions + * + * A magic placeholder class that can be caught by reference to + * recognize forced unwinding. + */ class __forced_unwind { virtual ~__forced_unwind() throw(); diff --git a/libstdc++-v3/libsupc++/cxxabi.h b/libstdc++-v3/libsupc++/cxxabi.h index d75515e07c4..2775b0809b0 100644 --- a/libstdc++-v3/libsupc++/cxxabi.h +++ b/libstdc++-v3/libsupc++/cxxabi.h @@ -1,6 +1,7 @@ // new abi support -*- C++ -*- -// Copyright (C) 2000, 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc. +// Copyright (C) 2000, 2002, 2003, 2004, 2006, 2007, 2009 +// Free Software Foundation, Inc. // // This file is part of GCC. // @@ -148,7 +149,47 @@ namespace __cxxabiv1 int __cxa_finalize(void*); - // Demangling routines. + + /** + * @brief Demangling routine. + * ABI-mandated entry point in the C++ runtime library for demangling. + * + * @param __mangled_name A NUL-terminated character string + * containing the name to be demangled. + * + * @param __output_buffer A region of memory, allocated with + * malloc, of @a *__length bytes, into which the demangled name is + * stored. If @a __output_buffer is not long enough, it is + * expanded using realloc. @a __output_buffer may instead be NULL; + * in that case, the demangled name is placed in a region of memory + * allocated with malloc. + * + * @param __length If @a __length is non-NULL, the length of the + * buffer containing the demangled name is placed in @a *__length. + * + * @param __status @a *__status is set to one of the following values: + * 0: The demangling operation succeeded. + * -1: A memory allocation failiure occurred. + * -2: @a mangled_name is not a valid name under the C++ ABI mangling rules. + * -3: One of the arguments is invalid. + * + * @return A pointer to the start of the NUL-terminated demangled + * name, or NULL if the demangling fails. The caller is + * responsible for deallocating this memory using @c free. + * + * The demangling is performed using the C++ ABI mangling rules, + * with GNU extensions. For example, this function is used in + * __gnu_cxx::__verbose_terminate_handler. + * + * See http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt12ch39.html + * for other examples of use. + * + * @note The same demangling functionality is available via + * libiberty (@c <libiberty/demangle.h> and @c libiberty.a) in GCC + * 3.1 and later, but that requires explicit installation (@c + * --enable-install-libiberty) and uses a different API, although + * the ABI is unchanged. + */ char* __cxa_demangle(const char* __mangled_name, char* __output_buffer, size_t* __length, int* __status); @@ -543,7 +584,26 @@ namespace __cxxabiv1 } // namespace __cxxabiv1 -// User programs should use the alias `abi'. +/** @namespace abi + * @brief The cross-vendor C++ Application Binary Interface. A + * namespace alias to __cxxabiv1, but user programs should use the + * alias `abi'. + * + * A brief overview of an ABI is given in the libstdc++ FAQ, question + * 5.8 (you may have a copy of the FAQ locally, or you can view the online + * version at http://gcc.gnu.org/onlinedocs/libstdc++/faq/index.html#5_8). + * + * GCC subscribes to a cross-vendor ABI for C++, sometimes + * called the IA64 ABI because it happens to be the native ABI for that + * platform. It is summarized at http://www.codesourcery.com/cxx-abi/ + * along with the current specification. + * + * For users of GCC greater than or equal to 3.x, entry points are + * available in <cxxabi.h>, which notes, <em>"It is not normally + * necessary for user programs to include this header, or use the + * entry points directly. However, this header is available should + * that be needed."</em> +*/ namespace abi = __cxxabiv1; #endif // __cplusplus diff --git a/libstdc++-v3/libsupc++/exception b/libstdc++-v3/libsupc++/exception index 0accb2f4938..37c5f7b2ff1 100644 --- a/libstdc++-v3/libsupc++/exception +++ b/libstdc++-v3/libsupc++/exception @@ -1,7 +1,7 @@ // Exception Handling support header for -*- C++ -*- // Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, -// 2004, 2005, 2006, 2007, 2008 +// 2004, 2005, 2006, 2007, 2008, 2009 // Free Software Foundation // // This file is part of GCC. @@ -46,6 +46,14 @@ extern "C++" { namespace std { /** + * @defgroup exceptions Exceptions + * @ingroup diagnostics + * + * Classes and functions for reporting errors via exception classes. + * @{ + */ + + /** * @brief Base class for all library exceptions. * * This is the base class for all exceptions thrown by the standard @@ -111,21 +119,28 @@ namespace std */ bool uncaught_exception() throw(); + // @} group exceptions } // namespace std _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) - /** A replacement for the standard terminate_handler which prints more - information about the terminating exception (if any) on stderr. Call - @code - std::set_terminate (__gnu_cxx::__verbose_terminate_handler) - @endcode - to use. For more info, see - http://gcc.gnu.org/onlinedocs/libstdc++/19_diagnostics/howto.html#4 - - In 3.4 and later, this is on by default. - */ - void __verbose_terminate_handler (); + /** + * @brief A replacement for the standard terminate_handler which + * prints more information about the terminating exception (if any) + * on stderr. + * + * @ingroup exceptions + * + * Call + * @code + * std::set_terminate(__gnu_cxx::__verbose_terminate_handler) + * @endcode + * to use. For more info, see + * http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt02ch06s02.html + * + * In 3.4 and later, this is on by default. + */ + void __verbose_terminate_handler(); _GLIBCXX_END_NAMESPACE diff --git a/libstdc++-v3/libsupc++/exception_ptr.h b/libstdc++-v3/libsupc++/exception_ptr.h index ae07db5f794..2bee2008ec3 100644 --- a/libstdc++-v3/libsupc++/exception_ptr.h +++ b/libstdc++-v3/libsupc++/exception_ptr.h @@ -49,6 +49,11 @@ extern "C++" { namespace std { + /** + * @addtogroup exceptions + * @{ + */ + // Hide the free operators from other types namespace __exception_ptr { @@ -70,16 +75,17 @@ namespace std void rethrow_exception(exception_ptr) __attribute__ ((__noreturn__)); /// Obtain an %exception_ptr pointing to a copy of the supplied object. - template <class _Ex> - exception_ptr copy_exception(_Ex __ex) throw(); - + template<typename _Ex> + exception_ptr + copy_exception(_Ex __ex) throw(); namespace __exception_ptr { - bool operator==(const exception_ptr&, - const exception_ptr&) throw(); - bool operator!=(const exception_ptr&, - const exception_ptr&) throw(); + bool + operator==(const exception_ptr&, const exception_ptr&) throw(); + + bool + operator!=(const exception_ptr&, const exception_ptr&) throw(); class exception_ptr { @@ -109,16 +115,16 @@ namespace std #ifdef __GXX_EXPERIMENTAL_CXX0X__ exception_ptr(exception_ptr&& __o) throw() - : _M_exception_object(__o._M_exception_object) - { - __o._M_exception_object = 0; - } + : _M_exception_object(__o._M_exception_object) + { __o._M_exception_object = 0; } #endif - exception_ptr& operator=(const exception_ptr&) throw(); + exception_ptr& + operator=(const exception_ptr&) throw(); #ifdef __GXX_EXPERIMENTAL_CXX0X__ - exception_ptr& operator=(exception_ptr&& __o) throw() + exception_ptr& + operator=(exception_ptr&& __o) throw() { exception_ptr(__o).swap(*this); return *this; @@ -127,10 +133,12 @@ namespace std ~exception_ptr() throw(); - void swap(exception_ptr&) throw(); + void + swap(exception_ptr&) throw(); #ifdef __GXX_EXPERIMENTAL_CXX0X__ - void swap(exception_ptr &&__o) throw() + void + swap(exception_ptr &&__o) throw() { void *__tmp = _M_exception_object; _M_exception_object = __o._M_exception_object; @@ -141,28 +149,31 @@ namespace std bool operator!() const throw(); operator __safe_bool() const throw(); - friend bool operator==(const exception_ptr&, - const exception_ptr&) throw(); + friend bool + operator==(const exception_ptr&, const exception_ptr&) throw(); - const type_info *__cxa_exception_type() const throw(); + const type_info* + __cxa_exception_type() const throw(); }; } // namespace __exception_ptr - template <class _Ex> - exception_ptr copy_exception(_Ex __ex) throw() - { - __try - { - throw __ex; - } - __catch(...) - { - return current_exception (); - } - } - + template<typename _Ex> + exception_ptr + copy_exception(_Ex __ex) throw() + { + __try + { + throw __ex; + } + __catch(...) + { + return current_exception (); + } + } + + // @} group exceptions } // namespace std } // extern "C++" diff --git a/libstdc++-v3/libsupc++/new b/libstdc++-v3/libsupc++/new index a821783b14a..739bd2af894 100644 --- a/libstdc++-v3/libsupc++/new +++ b/libstdc++-v3/libsupc++/new @@ -1,7 +1,7 @@ // The -*- C++ -*- dynamic memory management header. // Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -// 2003, 2004, 2005, 2006, 2007 +// 2003, 2004, 2005, 2006, 2007, 2009 // Free Software Foundation // This file is part of GCC. @@ -52,6 +52,7 @@ namespace std { /** * @brief Exception possibly thrown by @c new. + * @ingroup exceptions * * @c bad_alloc (or classes derived from it) is used to report allocation * errors from the throwing forms of @c new. */ diff --git a/libstdc++-v3/libsupc++/typeinfo b/libstdc++-v3/libsupc++/typeinfo index 773d2f5ca4a..a684be47d29 100644 --- a/libstdc++-v3/libsupc++/typeinfo +++ b/libstdc++-v3/libsupc++/typeinfo @@ -160,6 +160,7 @@ namespace std /** * @brief Thrown during incorrect typecasting. + * @ingroup exceptions * * If you attempt an invalid @c dynamic_cast expression, an instance of * this class (or something derived from this class) is thrown. */ @@ -176,7 +177,10 @@ namespace std virtual const char* what() const throw(); }; - /** If you use a NULL pointer in a @c typeid expression, this is thrown. */ + /** + * @brief Thrown when a NULL pointer in a @c typeid expression is used. + * @ingroup exceptions + */ class bad_typeid : public exception { public: diff --git a/libstdc++-v3/testsuite/20_util/duration/cons/1_neg.cc b/libstdc++-v3/testsuite/20_util/duration/cons/1_neg.cc index d8b08dbd4f8..5c84f309509 100644 --- a/libstdc++-v3/testsuite/20_util/duration/cons/1_neg.cc +++ b/libstdc++-v3/testsuite/20_util/duration/cons/1_neg.cc @@ -2,7 +2,7 @@ // { dg-options "-std=gnu++0x" } // { dg-require-cstdint "" } -// Copyright (C) 2008 Free Software Foundation +// Copyright (C) 2008, 2009 Free Software Foundation // // 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 @@ -41,6 +41,6 @@ test02() // { dg-error "instantiated from here" "" { target *-*-* } 30 } // { dg-error "instantiated from here" "" { target *-*-* } 39 } -// { dg-error "not exactly representable" "" { target *-*-* } 218 } -// { dg-error "integral duration with floating point" "" { target *-*-* } 208 } +// { dg-error "not exactly representable" "" { target *-*-* } 232 } +// { dg-error "integral duration with floating point" "" { target *-*-* } 222 } // { dg-excess-errors "In instantiation of" } diff --git a/libstdc++-v3/testsuite/20_util/duration/requirements/typedefs_neg1.cc b/libstdc++-v3/testsuite/20_util/duration/requirements/typedefs_neg1.cc index 188950d6347..d45795f988d 100644 --- a/libstdc++-v3/testsuite/20_util/duration/requirements/typedefs_neg1.cc +++ b/libstdc++-v3/testsuite/20_util/duration/requirements/typedefs_neg1.cc @@ -3,7 +3,7 @@ // { dg-require-cstdint "" } // 2008-07-31 Chris Fairles <chris.fairles@gmail.com> -// Copyright (C) 2008 Free Software Foundation, Inc. +// Copyright (C) 2008, 2009 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 @@ -40,6 +40,6 @@ void test01() test_type d; } -// { dg-error "rep cannot be a duration" "" { target *-*-* } 193 } +// { dg-error "rep cannot be a duration" "" { target *-*-* } 207 } // { dg-error "instantiated from here" "" { target *-*-* } 40 } // { dg-excess-errors "In instantiation of" } diff --git a/libstdc++-v3/testsuite/20_util/duration/requirements/typedefs_neg2.cc b/libstdc++-v3/testsuite/20_util/duration/requirements/typedefs_neg2.cc index 783044fada6..c4bbd171c2d 100644 --- a/libstdc++-v3/testsuite/20_util/duration/requirements/typedefs_neg2.cc +++ b/libstdc++-v3/testsuite/20_util/duration/requirements/typedefs_neg2.cc @@ -3,7 +3,7 @@ // { dg-require-cstdint "" } // 2008-07-31 Chris Fairles <chris.fairles@gmail.com> -// Copyright (C) 2008 Free Software Foundation, Inc. +// Copyright (C) 2008, 2009 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 @@ -41,6 +41,6 @@ void test01() test_type d; } -// { dg-error "must be a specialization of ratio" "" { target *-*-* } 194 } +// { dg-error "must be a specialization of ratio" "" { target *-*-* } 208 } // { dg-error "instantiated from here" "" { target *-*-* } 41 } // { dg-excess-errors "In instantiation of" } diff --git a/libstdc++-v3/testsuite/20_util/duration/requirements/typedefs_neg3.cc b/libstdc++-v3/testsuite/20_util/duration/requirements/typedefs_neg3.cc index 2896845d7d2..5bbe2840adf 100644 --- a/libstdc++-v3/testsuite/20_util/duration/requirements/typedefs_neg3.cc +++ b/libstdc++-v3/testsuite/20_util/duration/requirements/typedefs_neg3.cc @@ -3,7 +3,7 @@ // { dg-require-cstdint "" } // 2008-07-31 Chris Fairles <chris.fairles@gmail.com> -// Copyright (C) 2008 Free Software Foundation, Inc. +// Copyright (C) 2008, 2009 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 @@ -42,6 +42,6 @@ void test01() test_type d; } -// { dg-error "period must be positive" "" { target *-*-* } 196 } +// { dg-error "period must be positive" "" { target *-*-* } 210 } // { dg-error "instantiated from here" "" { target *-*-* } 42 } // { dg-excess-errors "In instantiation of" } diff --git a/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs_neg.cc b/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs_neg.cc index 59f679801c0..adda5b4191f 100644 --- a/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs_neg.cc +++ b/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs_neg.cc @@ -3,7 +3,7 @@ // 2007-05-03 Benjamin Kosnik <bkoz@redhat.com> // -// Copyright (C) 2007 Free Software Foundation, Inc. +// Copyright (C) 2007, 2009 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 @@ -49,8 +49,8 @@ void test01() // { dg-error "instantiated from here" "" { target *-*-* } 41 } // { dg-error "instantiated from here" "" { target *-*-* } 43 } -// { dg-error "invalid use of incomplete type" "" { target *-*-* } 555 } -// { dg-error "declaration of" "" { target *-*-* } 518 } +// { dg-error "invalid use of incomplete type" "" { target *-*-* } 562 } +// { dg-error "declaration of" "" { target *-*-* } 524 } // { dg-excess-errors "At global scope" } // { dg-excess-errors "In instantiation of" } diff --git a/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc b/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc index 170183dd868..4aea138f4ea 100644 --- a/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc +++ b/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc @@ -3,7 +3,7 @@ // 2007-05-03 Benjamin Kosnik <bkoz@redhat.com> // -// Copyright (C) 2007 Free Software Foundation, Inc. +// Copyright (C) 2007, 2009 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 @@ -49,8 +49,8 @@ void test01() // { dg-error "instantiated from here" "" { target *-*-* } 41 } // { dg-error "instantiated from here" "" { target *-*-* } 43 } -// { dg-error "invalid use of incomplete type" "" { target *-*-* } 477 } -// { dg-error "declaration of" "" { target *-*-* } 440 } +// { dg-error "invalid use of incomplete type" "" { target *-*-* } 483 } +// { dg-error "declaration of" "" { target *-*-* } 445 } // { dg-excess-errors "At global scope" } // { dg-excess-errors "In instantiation of" } diff --git a/libstdc++-v3/testsuite/20_util/ratio/cons/cons_overflow.cc b/libstdc++-v3/testsuite/20_util/ratio/cons/cons_overflow.cc index 570ea6cbc7d..220eb8ff63a 100644 --- a/libstdc++-v3/testsuite/20_util/ratio/cons/cons_overflow.cc +++ b/libstdc++-v3/testsuite/20_util/ratio/cons/cons_overflow.cc @@ -2,7 +2,7 @@ // { dg-options "-std=gnu++0x" } // { dg-require-cstdint "" } -// Copyright (C) 2008 Free Software Foundation +// Copyright (C) 2008, 2009 Free Software Foundation // // 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 @@ -50,6 +50,6 @@ test04() // { dg-error "instantiated from here" "" { target *-*-* } 35 } // { dg-error "instantiated from here" "" { target *-*-* } 41 } // { dg-error "instantiated from here" "" { target *-*-* } 47 } -// { dg-error "denominator cannot be zero" "" { target *-*-* } 150 } -// { dg-error "out of range" "" { target *-*-* } 151 } +// { dg-error "denominator cannot be zero" "" { target *-*-* } 158 } +// { dg-error "out of range" "" { target *-*-* } 159 } // { dg-excess-errors "In instantiation of" } diff --git a/libstdc++-v3/testsuite/20_util/ratio/operations/ops_overflow.cc b/libstdc++-v3/testsuite/20_util/ratio/operations/ops_overflow.cc index 860f9f253b2..318a8df6b40 100644 --- a/libstdc++-v3/testsuite/20_util/ratio/operations/ops_overflow.cc +++ b/libstdc++-v3/testsuite/20_util/ratio/operations/ops_overflow.cc @@ -4,7 +4,7 @@ // 2008-07-03 Chris Fairles <chris.fairles@gmail.com> -// Copyright (C) 2008 Free Software Foundation +// Copyright (C) 2008, 2009 Free Software Foundation // // 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 @@ -40,9 +40,9 @@ test02() // { dg-error "instantiated from here" "" { target *-*-* } 30 } // { dg-error "instantiated from here" "" { target *-*-* } 36 } // { dg-error "instantiated from here" "" { target *-*-* } 37 } -// { dg-error "overflow in addition" "" { target *-*-* } 127 } -// { dg-error "overflow in multiplication" "" { target *-*-* } 95 } -// { dg-error "overflow in multiplication" "" { target *-*-* } 97 } -// { dg-error "overflow in multiplication" "" { target *-*-* } 99 } +// { dg-error "overflow in addition" "" { target *-*-* } 135 } +// { dg-error "overflow in multiplication" "" { target *-*-* } 103 } +// { dg-error "overflow in multiplication" "" { target *-*-* } 105 } +// { dg-error "overflow in multiplication" "" { target *-*-* } 107 } // { dg-excess-errors "In instantiation of" } // { dg-excess-errors "out of range" } diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/assign/assign.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/assign/assign.cc index 457312ea526..272ed3a97ff 100644 --- a/libstdc++-v3/testsuite/20_util/unique_ptr/assign/assign.cc +++ b/libstdc++-v3/testsuite/20_util/unique_ptr/assign/assign.cc @@ -53,7 +53,7 @@ test03() // { dg-error "used here" "" { target *-*-* } 43 } // { dg-error "no matching" "" { target *-*-* } 49 } // { dg-error "used here" "" { target *-*-* } 50 } -// { dg-error "candidates are" "" { target *-*-* } 214 } -// { dg-error "deleted function" "" { target *-*-* } 214 } -// { dg-error "deleted function" "" { target *-*-* } 360 } +// { dg-error "candidates are" "" { target *-*-* } 219 } +// { dg-error "deleted function" "" { target *-*-* } 219 } +// { dg-error "deleted function" "" { target *-*-* } 365 } // { dg-excess-errors "note" } diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/modifiers/reset_neg.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/modifiers/reset_neg.cc index acff01ba260..1d6e9cf344c 100644 --- a/libstdc++-v3/testsuite/20_util/unique_ptr/modifiers/reset_neg.cc +++ b/libstdc++-v3/testsuite/20_util/unique_ptr/modifiers/reset_neg.cc @@ -37,4 +37,4 @@ void test01() } // { dg-error "used here" "" { target *-*-* } 36 } -// { dg-error "deleted function" "" { target *-*-* } 350 } +// { dg-error "deleted function" "" { target *-*-* } 355 } diff --git a/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/assign_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/assign_neg.cc index 242fc98a030..df859c345bc 100644 --- a/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/assign_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/assign_neg.cc @@ -1,6 +1,6 @@ // 2007-04-27 Paolo Carlini <pcarlini@suse.de> -// Copyright (C) 2007, 2008 Free Software Foundation +// Copyright (C) 2007, 2008, 2009 Free Software Foundation // // 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 @@ -19,7 +19,7 @@ // USA. // { dg-do compile } -// { dg-error "no matching" "" { target *-*-* } 1504 } +// { dg-error "no matching" "" { target *-*-* } 1503 } // { dg-excess-errors "" } #include <deque> diff --git a/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/constructor_1_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/constructor_1_neg.cc index 2664aac468d..c3f05523d7d 100644 --- a/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/constructor_1_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/constructor_1_neg.cc @@ -1,6 +1,6 @@ // 2007-04-27 Paolo Carlini <pcarlini@suse.de> -// Copyright (C) 2007, 2008 Free Software Foundation +// Copyright (C) 2007, 2008, 2009 Free Software Foundation // // 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 @@ -19,7 +19,7 @@ // USA. // { dg-do compile } -// { dg-error "no matching" "" { target *-*-* } 1443 } +// { dg-error "no matching" "" { target *-*-* } 1442 } // { dg-excess-errors "" } #include <deque> diff --git a/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/constructor_2_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/constructor_2_neg.cc index 66b76b79a49..eac9f2f7e3b 100644 --- a/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/constructor_2_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/constructor_2_neg.cc @@ -1,6 +1,6 @@ // 2007-04-27 Paolo Carlini <pcarlini@suse.de> -// Copyright (C) 2007, 2008 Free Software Foundation +// Copyright (C) 2007, 2008, 2009 Free Software Foundation // // 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 @@ -19,7 +19,7 @@ // USA. // { dg-do compile } -// { dg-error "no matching" "" { target *-*-* } 1443 } +// { dg-error "no matching" "" { target *-*-* } 1442 } // { dg-excess-errors "" } #include <deque> diff --git a/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/insert_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/insert_neg.cc index cff5332deb5..211fc983c51 100644 --- a/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/insert_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/insert_neg.cc @@ -1,6 +1,6 @@ // 2007-04-27 Paolo Carlini <pcarlini@suse.de> -// Copyright (C) 2007, 2008 Free Software Foundation +// Copyright (C) 2007, 2008, 2009 Free Software Foundation // // 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 @@ -19,7 +19,7 @@ // USA. // { dg-do compile } -// { dg-error "no matching" "" { target *-*-* } 1588 } +// { dg-error "no matching" "" { target *-*-* } 1587 } // { dg-excess-errors "" } #include <deque> diff --git a/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/assign_neg.cc b/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/assign_neg.cc index 5e7d7ea855b..50f2e1c0d63 100644 --- a/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/assign_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/assign_neg.cc @@ -1,6 +1,6 @@ // 2007-04-27 Paolo Carlini <pcarlini@suse.de> -// Copyright (C) 2007, 2008 Free Software Foundation +// Copyright (C) 2007, 2008, 2009 Free Software Foundation // // 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 @@ -19,7 +19,7 @@ // USA. // { dg-do compile } -// { dg-error "no matching" "" { target *-*-* } 1389 } +// { dg-error "no matching" "" { target *-*-* } 1388 } // { dg-excess-errors "" } #include <list> diff --git a/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_1_neg.cc b/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_1_neg.cc index dd9a4c34529..dbced18ccd6 100644 --- a/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_1_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_1_neg.cc @@ -1,6 +1,6 @@ // 2007-04-27 Paolo Carlini <pcarlini@suse.de> -// Copyright (C) 2007, 2008 Free Software Foundation +// Copyright (C) 2007, 2008, 2009 Free Software Foundation // // 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 @@ -19,7 +19,7 @@ // USA. // { dg-do compile } -// { dg-error "no matching" "" { target *-*-* } 1358 } +// { dg-error "no matching" "" { target *-*-* } 1357 } // { dg-excess-errors "" } #include <list> diff --git a/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc b/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc index 507c60df2fb..03ce39b9cba 100644 --- a/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc @@ -1,6 +1,6 @@ // 2007-04-27 Paolo Carlini <pcarlini@suse.de> -// Copyright (C) 2007, 2008 Free Software Foundation +// Copyright (C) 2007, 2008, 2009 Free Software Foundation // // 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 @@ -19,7 +19,7 @@ // USA. // { dg-do compile } -// { dg-error "no matching" "" { target *-*-* } 1358 } +// { dg-error "no matching" "" { target *-*-* } 1357 } // { dg-excess-errors "" } #include <list> diff --git a/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/insert_neg.cc b/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/insert_neg.cc index 497db793cef..d2e9cdba6f3 100644 --- a/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/insert_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/insert_neg.cc @@ -1,6 +1,6 @@ // 2007-04-27 Paolo Carlini <pcarlini@suse.de> -// Copyright (C) 2007, 2008 Free Software Foundation +// Copyright (C) 2007, 2008, 2009 Free Software Foundation // // 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 @@ -19,7 +19,7 @@ // USA. // { dg-do compile } -// { dg-error "no matching" "" { target *-*-* } 1358 } +// { dg-error "no matching" "" { target *-*-* } 1357 } // { dg-excess-errors "" } #include <list> diff --git a/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/assign_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/assign_neg.cc index 1f991cc938f..90a12c15dae 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/assign_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/assign_neg.cc @@ -19,7 +19,7 @@ // USA. // { dg-do compile } -// { dg-error "no matching" "" { target *-*-* } 1057 } +// { dg-error "no matching" "" { target *-*-* } 1056 } // { dg-excess-errors "" } #include <vector> diff --git a/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_1_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_1_neg.cc index ff4021e12c1..345c9c462ad 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_1_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_1_neg.cc @@ -19,7 +19,7 @@ // USA. // { dg-do compile } -// { dg-error "no matching" "" { target *-*-* } 997 } +// { dg-error "no matching" "" { target *-*-* } 996 } // { dg-excess-errors "" } #include <vector> diff --git a/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_2_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_2_neg.cc index e1f53211e6e..604d596de98 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_2_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_2_neg.cc @@ -19,7 +19,7 @@ // USA. // { dg-do compile } -// { dg-error "no matching" "" { target *-*-* } 997 } +// { dg-error "no matching" "" { target *-*-* } 996 } // { dg-excess-errors "" } #include <vector> diff --git a/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/insert_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/insert_neg.cc index 2c6169f1188..5fd1eebf176 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/insert_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/insert_neg.cc @@ -19,7 +19,7 @@ // USA. // { dg-do compile } -// { dg-error "no matching" "" { target *-*-* } 1098 } +// { dg-error "no matching" "" { target *-*-* } 1097 } // { dg-excess-errors "" } #include <vector> diff --git a/libstdc++-v3/testsuite/27_io/ios_base/cons/assign_neg.cc b/libstdc++-v3/testsuite/27_io/ios_base/cons/assign_neg.cc index 1cfa6efc004..f609558b39e 100644 --- a/libstdc++-v3/testsuite/27_io/ios_base/cons/assign_neg.cc +++ b/libstdc++-v3/testsuite/27_io/ios_base/cons/assign_neg.cc @@ -1,6 +1,6 @@ // { dg-do compile } -// Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software +// Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software // Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -43,5 +43,5 @@ void test01() } // { dg-error "synthesized" "" { target *-*-* } 42 } // { dg-error "within this context" "" { target *-*-* } 35 } -// { dg-error "is private" "" { target *-*-* } 793 } +// { dg-error "is private" "" { target *-*-* } 798 } // { dg-error "operator=" "" { target *-*-* } 0 } diff --git a/libstdc++-v3/testsuite/27_io/ios_base/cons/copy_neg.cc b/libstdc++-v3/testsuite/27_io/ios_base/cons/copy_neg.cc index 01300ab530d..6b539298627 100644 --- a/libstdc++-v3/testsuite/27_io/ios_base/cons/copy_neg.cc +++ b/libstdc++-v3/testsuite/27_io/ios_base/cons/copy_neg.cc @@ -1,6 +1,6 @@ // { dg-do compile } -// Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software +// Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software // Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -43,5 +43,5 @@ void test02() } // { dg-error "within this context" "" { target *-*-* } 36 } // { dg-error "synthesized" "" { target *-*-* } 42 } -// { dg-error "is private" "" { target *-*-* } 790 } +// { dg-error "is private" "" { target *-*-* } 795 } // { dg-error "copy constructor" "" { target *-*-* } 0 } diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/cons/assign_neg.cc b/libstdc++-v3/testsuite/29_atomics/atomic/cons/assign_neg.cc index 820d5aa21b0..b42750a3b70 100644 --- a/libstdc++-v3/testsuite/29_atomics/atomic/cons/assign_neg.cc +++ b/libstdc++-v3/testsuite/29_atomics/atomic/cons/assign_neg.cc @@ -1,7 +1,7 @@ // { dg-options "-std=gnu++0x" } // { dg-do compile } -// Copyright (C) 2008 Free Software Foundation, Inc. +// Copyright (C) 2008, 2009 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 @@ -39,19 +39,19 @@ int main() } // { dg-error "used here" "" { target *-*-* } 530 } -// { dg-error "deleted function" "" { target *-*-* } 239 } -// { dg-error "deleted function" "" { target *-*-* } 257 } -// { dg-error "deleted function" "" { target *-*-* } 275 } -// { dg-error "deleted function" "" { target *-*-* } 293 } -// { dg-error "deleted function" "" { target *-*-* } 311 } -// { dg-error "deleted function" "" { target *-*-* } 329 } -// { dg-error "deleted function" "" { target *-*-* } 347 } -// { dg-error "deleted function" "" { target *-*-* } 365 } -// { dg-error "deleted function" "" { target *-*-* } 383 } -// { dg-error "deleted function" "" { target *-*-* } 401 } -// { dg-error "deleted function" "" { target *-*-* } 419 } -// { dg-error "deleted function" "" { target *-*-* } 437 } -// { dg-error "deleted function" "" { target *-*-* } 455 } -// { dg-error "deleted function" "" { target *-*-* } 473 } -// { dg-error "deleted function" "" { target *-*-* } 491 } +// { dg-error "deleted function" "" { target *-*-* } 244 } +// { dg-error "deleted function" "" { target *-*-* } 262 } +// { dg-error "deleted function" "" { target *-*-* } 280 } +// { dg-error "deleted function" "" { target *-*-* } 298 } +// { dg-error "deleted function" "" { target *-*-* } 316 } +// { dg-error "deleted function" "" { target *-*-* } 334 } +// { dg-error "deleted function" "" { target *-*-* } 352 } +// { dg-error "deleted function" "" { target *-*-* } 370 } +// { dg-error "deleted function" "" { target *-*-* } 388 } +// { dg-error "deleted function" "" { target *-*-* } 406 } +// { dg-error "deleted function" "" { target *-*-* } 424 } +// { dg-error "deleted function" "" { target *-*-* } 442 } +// { dg-error "deleted function" "" { target *-*-* } 460 } +// { dg-error "deleted function" "" { target *-*-* } 478 } +// { dg-error "deleted function" "" { target *-*-* } 496 } // { dg-excess-errors "In member function" } diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/cons/copy_neg.cc b/libstdc++-v3/testsuite/29_atomics/atomic/cons/copy_neg.cc index b723066d75b..5ded4b763dc 100644 --- a/libstdc++-v3/testsuite/29_atomics/atomic/cons/copy_neg.cc +++ b/libstdc++-v3/testsuite/29_atomics/atomic/cons/copy_neg.cc @@ -1,7 +1,7 @@ // { dg-options "-std=gnu++0x" } // { dg-do compile } -// Copyright (C) 2008 Free Software Foundation, Inc. +// Copyright (C) 2008, 2009 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 @@ -39,19 +39,19 @@ int main() } // { dg-error "used here" "" { target *-*-* } 569 } -// { dg-error "deleted function" "" { target *-*-* } 238 } -// { dg-error "deleted function" "" { target *-*-* } 256 } -// { dg-error "deleted function" "" { target *-*-* } 274 } -// { dg-error "deleted function" "" { target *-*-* } 292 } -// { dg-error "deleted function" "" { target *-*-* } 310 } -// { dg-error "deleted function" "" { target *-*-* } 328 } -// { dg-error "deleted function" "" { target *-*-* } 346 } -// { dg-error "deleted function" "" { target *-*-* } 364 } -// { dg-error "deleted function" "" { target *-*-* } 382 } -// { dg-error "deleted function" "" { target *-*-* } 400 } -// { dg-error "deleted function" "" { target *-*-* } 418 } -// { dg-error "deleted function" "" { target *-*-* } 436 } -// { dg-error "deleted function" "" { target *-*-* } 454 } -// { dg-error "deleted function" "" { target *-*-* } 472 } -// { dg-error "deleted function" "" { target *-*-* } 490 } +// { dg-error "deleted function" "" { target *-*-* } 243 } +// { dg-error "deleted function" "" { target *-*-* } 261 } +// { dg-error "deleted function" "" { target *-*-* } 279 } +// { dg-error "deleted function" "" { target *-*-* } 297 } +// { dg-error "deleted function" "" { target *-*-* } 315 } +// { dg-error "deleted function" "" { target *-*-* } 333 } +// { dg-error "deleted function" "" { target *-*-* } 351 } +// { dg-error "deleted function" "" { target *-*-* } 369 } +// { dg-error "deleted function" "" { target *-*-* } 387 } +// { dg-error "deleted function" "" { target *-*-* } 405 } +// { dg-error "deleted function" "" { target *-*-* } 423 } +// { dg-error "deleted function" "" { target *-*-* } 441 } +// { dg-error "deleted function" "" { target *-*-* } 459 } +// { dg-error "deleted function" "" { target *-*-* } 477 } +// { dg-error "deleted function" "" { target *-*-* } 495 } // { dg-excess-errors "In member function" } diff --git a/libstdc++-v3/testsuite/30_threads/condition_variable/cons/assign_neg.cc b/libstdc++-v3/testsuite/30_threads/condition_variable/cons/assign_neg.cc index a29fb416c48..14b02119489 100644 --- a/libstdc++-v3/testsuite/30_threads/condition_variable/cons/assign_neg.cc +++ b/libstdc++-v3/testsuite/30_threads/condition_variable/cons/assign_neg.cc @@ -41,4 +41,4 @@ void test01() } // { dg-error "used here" "" { target *-*-* } 40 } -// { dg-error "deleted function" "" { target *-*-* } 64 } +// { dg-error "deleted function" "" { target *-*-* } 72 } diff --git a/libstdc++-v3/testsuite/30_threads/condition_variable/cons/copy_neg.cc b/libstdc++-v3/testsuite/30_threads/condition_variable/cons/copy_neg.cc index f27271623ec..63139ba47a2 100644 --- a/libstdc++-v3/testsuite/30_threads/condition_variable/cons/copy_neg.cc +++ b/libstdc++-v3/testsuite/30_threads/condition_variable/cons/copy_neg.cc @@ -40,4 +40,4 @@ void test01() } // { dg-error "used here" "" { target *-*-* } 39 } -// { dg-error "deleted function" "" { target *-*-* } 63 } +// { dg-error "deleted function" "" { target *-*-* } 71 } diff --git a/libstdc++-v3/testsuite/30_threads/condition_variable_any/cons/assign_neg.cc b/libstdc++-v3/testsuite/30_threads/condition_variable_any/cons/assign_neg.cc index 2bfdb798ebb..0a479548d8d 100644 --- a/libstdc++-v3/testsuite/30_threads/condition_variable_any/cons/assign_neg.cc +++ b/libstdc++-v3/testsuite/30_threads/condition_variable_any/cons/assign_neg.cc @@ -41,4 +41,4 @@ void test01() } // { dg-error "used here" "" { target *-*-* } 40 } -// { dg-error "deleted function" "" { target *-*-* } 172 } +// { dg-error "deleted function" "" { target *-*-* } 180 } diff --git a/libstdc++-v3/testsuite/30_threads/condition_variable_any/cons/copy_neg.cc b/libstdc++-v3/testsuite/30_threads/condition_variable_any/cons/copy_neg.cc index 3045257dcb1..f5f7c34f640 100644 --- a/libstdc++-v3/testsuite/30_threads/condition_variable_any/cons/copy_neg.cc +++ b/libstdc++-v3/testsuite/30_threads/condition_variable_any/cons/copy_neg.cc @@ -40,4 +40,4 @@ void test01() } // { dg-error "used here" "" { target *-*-* } 39 } -// { dg-error "deleted function" "" { target *-*-* } 171 } +// { dg-error "deleted function" "" { target *-*-* } 179 } diff --git a/libstdc++-v3/testsuite/30_threads/mutex/cons/assign_neg.cc b/libstdc++-v3/testsuite/30_threads/mutex/cons/assign_neg.cc index e58973b6371..d9465ebbfa0 100644 --- a/libstdc++-v3/testsuite/30_threads/mutex/cons/assign_neg.cc +++ b/libstdc++-v3/testsuite/30_threads/mutex/cons/assign_neg.cc @@ -42,4 +42,4 @@ void test01() } // { dg-error "used here" "" { target *-*-* } 41 } -// { dg-error "deleted function" "" { target *-*-* } 80 } +// { dg-error "deleted function" "" { target *-*-* } 88 } diff --git a/libstdc++-v3/testsuite/30_threads/mutex/cons/copy_neg.cc b/libstdc++-v3/testsuite/30_threads/mutex/cons/copy_neg.cc index e7b0bb642b6..8a3b584eb3b 100644 --- a/libstdc++-v3/testsuite/30_threads/mutex/cons/copy_neg.cc +++ b/libstdc++-v3/testsuite/30_threads/mutex/cons/copy_neg.cc @@ -41,4 +41,4 @@ void test01() } // { dg-error "used here" "" { target *-*-* } 40 } -// { dg-error "deleted function" "" { target *-*-* } 79 } +// { dg-error "deleted function" "" { target *-*-* } 87 } diff --git a/libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/assign_neg.cc b/libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/assign_neg.cc index a333a1478a6..ff00ed51d0d 100644 --- a/libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/assign_neg.cc +++ b/libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/assign_neg.cc @@ -42,4 +42,4 @@ void test01() } // { dg-error "used here" "" { target *-*-* } 41 } -// { dg-error "deleted function" "" { target *-*-* } 132 } +// { dg-error "deleted function" "" { target *-*-* } 140 } diff --git a/libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/copy_neg.cc b/libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/copy_neg.cc index 13a46dbcc8a..3cf78a9bbb4 100644 --- a/libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/copy_neg.cc +++ b/libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/copy_neg.cc @@ -41,4 +41,4 @@ void test01() } // { dg-error "used here" "" { target *-*-* } 40 } -// { dg-error "deleted function" "" { target *-*-* } 131 } +// { dg-error "deleted function" "" { target *-*-* } 139 } diff --git a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/cons/assign_neg.cc b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/cons/assign_neg.cc index fca55a0751a..3e4c6285935 100644 --- a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/cons/assign_neg.cc +++ b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/cons/assign_neg.cc @@ -3,7 +3,7 @@ // { dg-require-cstdint "" } // { dg-require-gthreads "" } -// Copyright (C) 2008 Free Software Foundation, Inc. +// Copyright (C) 2008, 2009 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 @@ -42,4 +42,4 @@ void test01() } // { dg-error "used here" "" { target *-*-* } 41 } -// { dg-error "deleted function" "" { target *-*-* } 295 } +// { dg-error "deleted function" "" { target *-*-* } 303 } diff --git a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/cons/copy_neg.cc b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/cons/copy_neg.cc index c4c254a6579..070519944e9 100644 --- a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/cons/copy_neg.cc +++ b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/cons/copy_neg.cc @@ -3,7 +3,7 @@ // { dg-require-cstdint "" } // { dg-require-gthreads "" } -// Copyright (C) 2008 Free Software Foundation, Inc. +// Copyright (C) 2008, 2009 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 @@ -41,4 +41,4 @@ void test01() } // { dg-error "used here" "" { target *-*-* } 40 } -// { dg-error "deleted function" "" { target *-*-* } 294 } +// { dg-error "deleted function" "" { target *-*-* } 302 } diff --git a/libstdc++-v3/testsuite/30_threads/thread/cons/assign_neg.cc b/libstdc++-v3/testsuite/30_threads/thread/cons/assign_neg.cc index 12a2d550df7..15e5fe3a7a3 100644 --- a/libstdc++-v3/testsuite/30_threads/thread/cons/assign_neg.cc +++ b/libstdc++-v3/testsuite/30_threads/thread/cons/assign_neg.cc @@ -33,4 +33,4 @@ void test01() } // { dg-error "used here" "" { target *-*-* } 32 } -// { dg-error "deleted function" "" { target *-*-* } 138 } +// { dg-error "deleted function" "" { target *-*-* } 146 } diff --git a/libstdc++-v3/testsuite/30_threads/thread/cons/copy_neg.cc b/libstdc++-v3/testsuite/30_threads/thread/cons/copy_neg.cc index d94b92bec12..8fbaa281cb1 100644 --- a/libstdc++-v3/testsuite/30_threads/thread/cons/copy_neg.cc +++ b/libstdc++-v3/testsuite/30_threads/thread/cons/copy_neg.cc @@ -32,5 +32,5 @@ void test01() } // { dg-error "here" "" { target *-*-* } 31 } -// { dg-error "deleted function" "" { target *-*-* } 119 } +// { dg-error "deleted function" "" { target *-*-* } 127 } // { dg-excess-errors "In file included from" } diff --git a/libstdc++-v3/testsuite/30_threads/timed_mutex/cons/assign_neg.cc b/libstdc++-v3/testsuite/30_threads/timed_mutex/cons/assign_neg.cc index 058cfd2837b..be2a8e831b7 100644 --- a/libstdc++-v3/testsuite/30_threads/timed_mutex/cons/assign_neg.cc +++ b/libstdc++-v3/testsuite/30_threads/timed_mutex/cons/assign_neg.cc @@ -42,4 +42,4 @@ void test01() } // { dg-error "used here" "" { target *-*-* } 41 } -// { dg-error "deleted function" "" { target *-*-* } 190 } +// { dg-error "deleted function" "" { target *-*-* } 198 } diff --git a/libstdc++-v3/testsuite/30_threads/timed_mutex/cons/copy_neg.cc b/libstdc++-v3/testsuite/30_threads/timed_mutex/cons/copy_neg.cc index d49fda728b8..d669b932d66 100644 --- a/libstdc++-v3/testsuite/30_threads/timed_mutex/cons/copy_neg.cc +++ b/libstdc++-v3/testsuite/30_threads/timed_mutex/cons/copy_neg.cc @@ -41,4 +41,4 @@ void test01() } // { dg-error "used here" "" { target *-*-* } 40 } -// { dg-error "deleted function" "" { target *-*-* } 189 } +// { dg-error "deleted function" "" { target *-*-* } 197 } |