user.cfg.in: Add macros, directories.

2011-12-10  Benjamin Kosnik  <bkoz@redhat.com>

	* doc/doxygen/user.cfg.in: Add macros, directories.
	* include/bits/locale_classes.h: Remove doxygen warnings, fix markup.
	* include/bits/locale_classes.tcc: Same.
	* include/bits/shared_ptr.h: Same.
	* include/bits/stl_algo.h: Same.
	* include/bits/stl_list.h: Same.
	* include/bits/stl_numeric.h: Same.
	* include/debug/safe_base.h: Same.
	* include/parallel/equally_split.h: Same.
	* include/std/bitset: Same.
	* include/std/complex: Same.
	* include/std/fstream: Same.
	* include/std/istream: Same.
	* include/std/ostream: Same.
	* include/tr2/dynamic_bitset: Same.
	* scripts/run_doxygen: Remove munging for names that no longer exist.

	* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
	Adjust line numbers.
	* testsuite/23_containers/list/requirements/dr438/
	constructor_1_neg.cc: Same.
	* testsuite/23_containers/list/requirements/dr438/
	constructor_2_neg.cc: Same.
	* testsuite/23_containers/list/requirements/dr438/insert_neg.cc: Same.

From-SVN: r182189

libstdc++-v3/ChangeLog

-2011-12-12  François Dumont <fdumont@gcc.gnu.org>
+2011-12-10  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* doc/doxygen/user.cfg.in: Add macros, directories.
+	* include/bits/locale_classes.h: Remove doxygen warnings, fix markup.
+	* include/bits/locale_classes.tcc: Same.
+	* include/bits/shared_ptr.h: Same.
+	* include/bits/stl_algo.h: Same.
+	* include/bits/stl_list.h: Same.
+	* include/bits/stl_numeric.h: Same.
+	* include/debug/safe_base.h: Same.
+	* include/parallel/equally_split.h: Same.
+	* include/std/bitset: Same.
+	* include/std/complex: Same.
+	* include/std/fstream: Same.
+	* include/std/istream: Same.
+	* include/std/ostream: Same.
+	* include/tr2/dynamic_bitset: Same.
+	* scripts/run_doxygen: Remove munging for names that no longer exist.
+
+	* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
+	Adjust line numbers.
+	* testsuite/23_containers/list/requirements/dr438/
+	constructor_1_neg.cc: Same.
+	* testsuite/23_containers/list/requirements/dr438/
+	constructor_2_neg.cc: Same.
+	* testsuite/23_containers/list/requirements/dr438/insert_neg.cc: Same.
+
+2011-12-10  François Dumont <fdumont@gcc.gnu.org>
 
 	* include/profile/unordered_set: Minor formatting changes.
 	(unordered_set<>::_M_profile_destruct,
@@ -171,11 +198,11 @@
 
 	* include/ext/atomicity.h: Use _GLIBCXX_ATOMIC_BUILTINS.
 
-        * doc/doxygen/user.cfg.in
-        * doc/xml/manual/concurrency_extensions.xml
+	* doc/doxygen/user.cfg.in: Adjust.
+	* doc/xml/manual/concurrency_extensions.xml: Add note.
 
-        * testsuite/18_support/exception_ptr/lifespan.cc
-        * testsuite/lib/libstdc++.exp
+	* testsuite/18_support/exception_ptr/lifespan.cc: Tweak.
+	* testsuite/lib/libstdc++.exp: Same.
 
 2011-11-29  François Dumont <fdumont@gcc.gnu.org>
 

libstdc++-v3/doc/doxygen/user.cfg.in

@@ -746,6 +746,7 @@ INPUT                  = @srcdir@/doc/doxygen/doxygroups.cc \
 			 include/tr1/ctime \
 			 include/tr1/cwchar \
 			 include/tr1/cwctype \
+			 include/tr2/ \
 			 include/tr2/bool_set \
 			 include/tr2/dynamic_bitset \
 			 include/tr2/ratio \
@@ -1647,9 +1648,10 @@ PREDEFINED             = __cplusplus \
 			 _GLIBCXX_USE_C99_STDINT_TR1 \
 			 _GLIBCXX_USE_SCHED_YIELD \
 			 _GLIBCXX_USE_NANOSLEEP \
-			 PB_DS_DATA_TRUE_INDICATOR \
 			 __EXCEPTIONS \
 			 __GXX_RTTI \
+                         ATOMIC_INT_LOCK_FREE \
+			 PB_DS_DATA_TRUE_INDICATOR \
 			 __glibcxx_function_requires=// \
 			 __glibcxx_class_requires=// \
 			 __glibcxx_class_requires2=// \

libstdc++-v3/include/bits/locale_classes.h

@@ -571,39 +571,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
 
   /**
-   *  @brief  Test for the presence of a facet.
-   *
-   *  has_facet tests the locale argument for the presence of the facet type
-   *  provided as the template parameter.  Facets derived from the facet
-   *  parameter will also return true.
-   *
-   *  @tparam  _Facet  The facet type to test the presence of.
-   *  @param  __loc  The locale to test.
-   *  @return  true if __loc contains a facet of type _Facet, else false.
-  */
-  template<typename _Facet>
-    bool
-    has_facet(const locale& __loc) throw();
-
-  /**
-   *  @brief  Return a facet.
-   *
-   *  use_facet looks for and returns a reference to a facet of type Facet
-   *  where Facet is the template parameter.  If has_facet(locale) is true,
-   *  there is a suitable facet to return.  It throws std::bad_cast if the
-   *  locale doesn't contain a facet of type Facet.
-   *
-   *  @tparam  _Facet  The facet type to access.
-   *  @param  __loc  The locale to use.
-   *  @return  Reference to facet of type Facet.
-   *  @throw  std::bad_cast if __loc doesn't contain a facet of type _Facet.
-  */
-  template<typename _Facet>
-    const _Facet&
-    use_facet(const locale& __loc);
-
-
-  /**
    *  @brief  Facet for localized string comparison.
    *
    *  This facet encapsulates the code to compare strings in a localized

libstdc++-v3/include/bits/locale_classes.tcc

@@ -87,7 +87,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 				__s2.data(), __s2.data() + __s2.length()) < 0);
     }
 
-
+  /**
+   *  @brief  Test for the presence of a facet.
+   *
+   *  has_facet tests the locale argument for the presence of the facet type
+   *  provided as the template parameter.  Facets derived from the facet
+   *  parameter will also return true.
+   *
+   *  @tparam  _Facet  The facet type to test the presence of.
+   *  @param  __loc  The locale to test.
+   *  @return  true if @p __loc contains a facet of type _Facet, else false.
+  */
   template<typename _Facet>
     bool
     has_facet(const locale& __loc) throw()
@@ -102,6 +112,19 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 #endif
     }
 
+  /**
+   *  @brief  Return a facet.
+   *
+   *  use_facet looks for and returns a reference to a facet of type Facet
+   *  where Facet is the template parameter.  If has_facet(locale) is true,
+   *  there is a suitable facet to return.  It throws std::bad_cast if the
+   *  locale doesn't contain a facet of type Facet.
+   *
+   *  @tparam  _Facet  The facet type to access.
+   *  @param  __loc  The locale to use.
+   *  @return  Reference to facet of type Facet.
+   *  @throw  std::bad_cast if @p __loc doesn't contain a facet of type _Facet.
+  */
   template<typename _Facet>
     const _Facet&
     use_facet(const locale& __loc)

libstdc++-v3/include/bits/shared_ptr.h

@@ -100,6 +100,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       constexpr shared_ptr() noexcept
       : __shared_ptr<_Tp>() { }
 
+      shared_ptr(const shared_ptr&) noexcept = default;
+
       /**
        *  @brief  Construct a %shared_ptr that owns the pointer @a __p.
        *  @param  __p  A pointer that is convertible to element_type*.
@@ -211,7 +213,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        *  @param  __r  A %shared_ptr.
        *  @post   get() == __r.get() && use_count() == __r.use_count()
        */
-      shared_ptr(const shared_ptr&) noexcept = default;
       template<typename _Tp1, typename = typename
 	       std::enable_if<std::is_convertible<_Tp1*, _Tp*>::value>::type>
 	shared_ptr(const shared_ptr<_Tp1>& __r) noexcept
@@ -266,6 +267,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       : __shared_ptr<_Tp>(__p) { }
 
       shared_ptr& operator=(const shared_ptr&) noexcept = default;
+
       template<typename _Tp1>
 	shared_ptr&
 	operator=(const shared_ptr<_Tp1>& __r) noexcept

libstdc++-v3/include/bits/stl_list.h

@@ -1441,9 +1441,10 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
 
       /**
        *  @brief  Merge sorted lists according to comparison function.
-       *  @param  __x  Sorted list to merge.
        *  @tparam _StrictWeakOrdering Comparison function defining
        *  sort order.
+       *  @param  __x  Sorted list to merge.
+       *  @param  __comp  Comparison functor.
        *
        *  Assumes that both @a __x and this list are sorted according to
        *  StrictWeakOrdering.  Merges elements of @a __x into this list

libstdc++-v3/include/bits/stl_numeric.h

@@ -133,7 +133,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
    *  @brief  Accumulate values in a range with operation.
    *
    *  Accumulates the values in the range [first,last) using the function
-   *  object @a binary_op.  The initial value is @a init.  The values are
+   *  object @p __binary_op.  The initial value is @p __init.  The values are
    *  processed in order.
    *
    *  @param  __first  Start of range.
@@ -159,7 +159,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
   /**
    *  @brief  Compute inner product of two ranges.
    *
-   *  Starting with an initial value of @a init, multiplies successive
+   *  Starting with an initial value of @p __init, multiplies successive
    *  elements from the two ranges and adds each product into the accumulated
    *  value using operator+().  The values in the ranges are processed in
    *  order.
@@ -188,9 +188,9 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
   /**
    *  @brief  Compute inner product of two ranges.
    *
-   *  Starting with an initial value of @a init, applies @a binary_op2 to
+   *  Starting with an initial value of @p __init, applies @p __binary_op2 to
    *  successive elements from the two ranges and accumulates each result into
-   *  the accumulated value using @a binary_op1.  The values in the ranges are
+   *  the accumulated value using @p __binary_op1.  The values in the ranges are
    *  processed in order.
    *
    *  @param  __first1  Start of range 1.
@@ -224,14 +224,14 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
    *
    *  Accumulates the values in the range [first,last) using operator+().
    *  As each successive input value is added into the total, that partial sum
-   *  is written to @a result.  Therefore, the first value in result is the
+   *  is written to @p __result.  Therefore, the first value in result is the
    *  first value of the input, the second value in result is the sum of the
    *  first and second input values, and so on.
    *
    *  @param  __first  Start of input range.
    *  @param  __last  End of input range.
-   *  @param  __result  Output to write sums to.
-   *  @return  Iterator pointing just beyond the values written to result.
+   *  @param  __result  Output sum.
+   *  @return  Iterator pointing just beyond the values written to __result.
    */
   template<typename _InputIterator, typename _OutputIterator>
     _OutputIterator
@@ -263,14 +263,14 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
    *
    *  Accumulates the values in the range [first,last) using operator+().
    *  As each successive input value is added into the total, that partial sum
-   *  is written to @a result.  Therefore, the first value in result is the
+   *  is written to @p __result.  Therefore, the first value in result is the
    *  first value of the input, the second value in result is the sum of the
    *  first and second input values, and so on.
    *
    *  @param  __first  Start of input range.
    *  @param  __last  End of input range.
-   *  @param  __result  Output to write sums to.
-   *  @return  Iterator pointing just beyond the values written to result.
+   *  @param  __result  Output sum.
+   *  @return  Iterator pointing just beyond the values written to __result.
    */
   template<typename _InputIterator, typename _OutputIterator,
 	   typename _BinaryOperation>
@@ -302,11 +302,11 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
    *  @brief  Return differences between adjacent values.
    *
    *  Computes the difference between adjacent values in the range
-   *  [first,last) using operator-() and writes the result to @a result.
+   *  [first,last) using operator-() and writes the result to @p __result.
    *
    *  @param  __first  Start of input range.
    *  @param  __last  End of input range.
-   *  @param  __result  Output to write sums to.
+   *  @param  __result  Output sums.
    *  @return  Iterator pointing just beyond the values written to result.
    *
    *  _GLIBCXX_RESOLVE_LIB_DEFECTS
@@ -342,12 +342,13 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
    *  @brief  Return differences between adjacent values.
    *
    *  Computes the difference between adjacent values in the range
-   *  [__first,__last) using the function object @a __binary_op and writes the
-   *  result to @a __result.
+   *  [__first,__last) using the function object @p __binary_op and writes the
+   *  result to @p __result.
    *
    *  @param  __first  Start of input range.
    *  @param  __last  End of input range.
-   *  @param  __result  Output to write sums to.
+   *  @param  __result  Output sum.
+   *  @param  __binary_op Function object.
    *  @return  Iterator pointing just beyond the values written to result.
    *
    *  _GLIBCXX_RESOLVE_LIB_DEFECTS

libstdc++-v3/include/debug/safe_base.h

@@ -79,7 +79,7 @@ namespace __gnu_debug
     { }
 
     /** Initialize the iterator to reference the sequence pointed to
-     *  by @p__seq. @p __constant is true when we are initializing a
+     *  by @p __seq. @p __constant is true when we are initializing a
      *  constant iterator, and false if it is a mutable iterator. Note
      *  that @p __seq may be NULL, in which case the iterator will be
      *  singular. Otherwise, the iterator will reference @p __seq and

libstdc++-v3/include/parallel/equally_split.h

@@ -68,6 +68,7 @@ namespace __gnu_parallel
    *  thread number __thread_no+1 (excluded).
    *  @param __n Number of elements
    *  @param __num_threads Number of parts
+   *  @param __thread_no Number of threads
    *  @returns splitting point */
   template<typename _DifferenceType>
     _DifferenceType

libstdc++-v3/include/std/bitset

@@ -683,7 +683,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
 #endif
 
   /**
-   *  @brief  The %bitset class represents a @e fixed-size sequence of bits.
+   *  The %bitset class represents a @e fixed-size sequence of bits.
    *
    *  @ingroup containers
    *
@@ -855,7 +855,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
 #endif
 
       /**
-       *  @brief  Use a subset of a string.
+       *  Use a subset of a string.
        *  @param  __s  A string of @a 0 and @a 1 characters.
        *  @param  __position  Index of the first character in @a __s to use;
        *                    defaults to zero.
@@ -878,7 +878,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
 	}
 
       /**
-       *  @brief  Use a subset of a string.
+       *  Use a subset of a string.
        *  @param  __s  A string of @a 0 and @a 1 characters.
        *  @param  __position  Index of the first character in @a __s to use.
        *  @param  __n    The number of characters to copy.
@@ -914,7 +914,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
 
 #ifdef __GXX_EXPERIMENTAL_CXX0X__
       /**
-       *  @brief  Construct from a character %array.
+       *  Construct from a character %array.
        *  @param  __str  An %array of characters @a zero and @a one.
        *  @param  __n    The number of characters to use.
        *  @param  __zero The character corresponding to the value 0.
@@ -944,7 +944,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
       // 23.3.5.2 bitset operations:
       //@{
       /**
-       *  @brief  Operations on bitsets.
+       *  Operations on bitsets.
        *  @param  __rhs  A same-sized bitset.
        *
        *  These should be self-explanatory.
@@ -973,7 +973,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
       
       //@{
       /**
-       *  @brief  Operations on bitsets.
+       *  Operations on bitsets.
        *  @param  __position  The number of places to shift.
        *
        *  These should be self-explanatory.

libstdc++-v3/include/std/complex

@@ -1035,8 +1035,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 	                 : std::pow(complex<_Tp>(__x), __y);
     }
 
-  // 26.2.3  complex specializations
-  // complex<float> specialization
+  /// 26.2.3  complex specializations
+  /// complex<float> specialization
   template<>
     struct complex<float>
     {
@@ -1182,8 +1182,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       _ComplexT _M_value;
     };
 
-  // 26.2.3  complex specializations
-  // complex<double> specialization
+  /// 26.2.3  complex specializations
+  /// complex<double> specialization
   template<>
     struct complex<double>
     {
@@ -1330,8 +1330,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       _ComplexT _M_value;
     };
 
-  // 26.2.3  complex specializations
-  // complex<long double> specialization
+  /// 26.2.3  complex specializations
+  /// complex<long double> specialization
   template<>
     struct complex<long double>
     {

libstdc++-v3/include/std/fstream

@@ -620,7 +620,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        *  @param  __mode  Open file in specified mode (see std::ios_base).
        *
        *  @c ios_base::out|ios_base::trunc is automatically included in
-       *  @a __mode.
+       *  @p __mode.
        *
        *  Tip:  When using std::string to hold the filename, you must use
        *  .c_str() before passing it to this constructor.

libstdc++-v3/include/std/istream

@@ -44,9 +44,8 @@ namespace std _GLIBCXX_VISIBILITY(default)
 {
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
-  // [27.6.1.1] Template class basic_istream
   /**
-   *  @brief  Controlling input.
+   *  @brief  Template class basic_istream.
    *  @ingroup io
    *
    *  This is the base class for all input streams.  It provides text
@@ -81,7 +80,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       streamsize 		_M_gcount;
 
     public:
-      // [27.6.1.1.1] constructor/destructor
       /**
        *  @brief  Base constructor.
        *
@@ -103,12 +101,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       ~basic_istream()
       { _M_gcount = streamsize(0); }
 
-      // [27.6.1.1.2] prefix/suffix
+      /// Safe prefix/suffix operations.
       class sentry;
       friend class sentry;
 
-      // [27.6.1.2] formatted input
-      // [27.6.1.2.3] basic_istream::operator>>
       //@{
       /**
        *  @brief  Interface for manipulators.
@@ -137,9 +133,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       }
       //@}
 
-      // [27.6.1.2.2] arithmetic extractors
+      //@{
       /**
-       *  @name Arithmetic Extractors
+       *  @name Extractors
        *
        *  All the @c operator>> functions (aka <em>formatted input
        *  functions</em>) have some common behavior.  Each starts by
@@ -156,10 +152,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        *  ios_base::failure to be thrown.  The original exception will then
        *  be rethrown.
       */
+
       //@{
       /**
-       *  @brief  Basic arithmetic extractors
-       *  @param  __n, __f, __p: A variable of builtin type.
+       *  @brief  Integer arithmetic extractors
+       *  @param  __n A variable of builtin integral type.
        *  @return  @c *this if successful
        *
        *  These functions use the stream's current locale (specifically, the
@@ -200,7 +197,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       operator>>(unsigned long long& __n)
       { return _M_extract(__n); }
 #endif
+      //@}
 
+      //@{
+      /**
+       *  @brief  Floating point arithmetic extractors
+       *  @param  __f A variable of builtin floating point type.
+       *  @return  @c *this if successful
+       *
+       *  These functions use the stream's current locale (specifically, the
+       *  @c num_get facet) to parse the input data.
+      */
       __istream_type&
       operator>>(float& __f)
       { return _M_extract(__f); }
@@ -212,7 +219,16 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       __istream_type&
       operator>>(long double& __f)
       { return _M_extract(__f); }
+      //@}
 
+      /**
+       *  @brief  Basic arithmetic extractors
+       *  @param  __p A variable of pointer type.
+       *  @return  @c *this if successful
+       *
+       *  These functions use the stream's current locale (specifically, the
+       *  @c num_get facet) to parse the input data.
+      */
       __istream_type&
       operator>>(void*& __p)
       { return _M_extract(__p); }
@@ -225,10 +241,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        *  in that it also constructs a sentry object and has the same error
        *  handling behavior.
        *
-       *  If @a __sb is NULL, the stream will set failbit in its error state.
+       *  If @p __sb is NULL, the stream will set failbit in its error state.
        *
        *  Characters are extracted from this stream and inserted into the
-       *  @a sb streambuf until one of the following occurs:
+       *  @p __sb streambuf until one of the following occurs:
        *
        *  - the input stream reaches end-of-file,
        *  - insertion into the output buffer fails (in this case, the
@@ -251,6 +267,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       gcount() const
       { return _M_gcount; }
 
+      //@{
       /**
        *  @name Unformatted Input Functions
        *
@@ -271,7 +288,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        *  ios_base::failure to be thrown.  The original exception will then
        *  be rethrown.
       */
-      //@{
+
       /**
        *  @brief  Simple extraction.
        *  @return  A character, or eof().
@@ -593,7 +610,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 	_M_extract(_ValueT& __v);
     };
 
-  // Explicit specialization declarations, defined in src/istream.cc.
+  /// Explicit specialization declarations, defined in src/istream.cc.
   template<>
     basic_istream<char>&
     basic_istream<char>::
@@ -687,7 +704,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       { return _M_ok; }
     };
 
-  // [27.6.1.2.3] character extraction templates
   //@{
   /**
    *  @brief  Character extractors
@@ -762,9 +778,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     { return (__in >> reinterpret_cast<char*>(__s)); }
   //@}
 
-  // 27.6.1.5 Template class basic_iostream
   /**
-   *  @brief  Merging istream and ostream capabilities.
+   *  @brief  Template class basic_iostream
    *  @ingroup io
    *
    *  This class multiply inherits from the input and output stream classes
@@ -810,7 +825,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       : __istream_type(), __ostream_type() { }
     };
 
-  // [27.6.1.4] standard basic_istream manipulators
   /**
    *  @brief  Quick and easy way to eat whitespace
    *

libstdc++-v3/include/std/ostream

@@ -44,9 +44,8 @@ namespace std _GLIBCXX_VISIBILITY(default)
 {
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
-  // [27.6.2.1] Template class basic_ostream
   /**
-   *  @brief  Controlling output.
+   *  @brief  Template class basic_ostream.
    *  @ingroup io
    *
    *  This is the base class for all output streams.  It provides text
@@ -57,7 +56,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     class basic_ostream : virtual public basic_ios<_CharT, _Traits>
     {
     public:
-      // Types (inherited from basic_ios (27.4.4)):
+      // Types (inherited from basic_ios):
       typedef _CharT			 		char_type;
       typedef typename _Traits::int_type 		int_type;
       typedef typename _Traits::pos_type 		pos_type;
@@ -72,7 +71,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       							__num_put_type;
       typedef ctype<_CharT>	      			__ctype_type;
 
-      // [27.6.2.2] constructor/destructor
       /**
        *  @brief  Base constructor.
        *
@@ -92,12 +90,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       virtual
       ~basic_ostream() { }
 
-      // [27.6.2.3] prefix/suffix
+      /// Safe prefix/suffix operations.
       class sentry;
       friend class sentry;
 
-      // [27.6.2.5] formatted output
-      // [27.6.2.5.3]  basic_ostream::operator<<
       //@{
       /**
        *  @brief  Interface for manipulators.
@@ -136,9 +132,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       }
       //@}
 
-      // [27.6.2.5.2] arithmetic inserters
+      //@{
       /**
-       *  @name Arithmetic Inserters
+       *  @name Inserters
        *
        *  All the @c operator<< functions (aka <em>formatted output
        *  functions</em>) have some common behavior.  Each starts by
@@ -154,10 +150,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        *  ios_base::failure to be thrown.  The original exception will then
        *  be rethrown.
       */
+
       //@{
       /**
-       *  @brief  Basic arithmetic inserters
-       *  @param  __n, __f, __p A variable of builtin type.
+       *  @brief Integer arithmetic inserters
+       *  @param  __n A variable of builtin integral type.
        *  @return  @c *this if successful
        *
        *  These functions use the stream's current locale (specifically, the
@@ -206,7 +203,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       operator<<(unsigned long long __n)
       { return _M_insert(__n); }
 #endif
+      //@}
 
+      //@{
+      /**
+       *  @brief  Floating point arithmetic inserters
+       *  @param  __f A variable of builtin floating point type.
+       *  @return  @c *this if successful
+       *
+       *  These functions use the stream's current locale (specifically, the
+       *  @c num_get facet) to perform numeric formatting.
+      */
       __ostream_type&
       operator<<(double __f)
       { return _M_insert(__f); }
@@ -222,7 +229,16 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       __ostream_type&
       operator<<(long double __f)
       { return _M_insert(__f); }
+      //@}
 
+      /**
+       *  @brief  Pointer arithmetic inserters
+       *  @param  __p A variable of pointer type.
+       *  @return  @c *this if successful
+       *
+       *  These functions use the stream's current locale (specifically, the
+       *  @c num_get facet) to perform numeric formatting.
+      */
       __ostream_type&
       operator<<(const void* __p)
       { return _M_insert(__p); }
@@ -235,15 +251,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        *  in that it also constructs a sentry object and has the same error
        *  handling behavior.
        *
-       *  If @a __sb is NULL, the stream will set failbit in its error state.
+       *  If @p __sb is NULL, the stream will set failbit in its error state.
        *
-       *  Characters are extracted from @a __sb and inserted into @c *this
+       *  Characters are extracted from @p __sb and inserted into @c *this
        *  until one of the following occurs:
        *
        *  - the input stream reaches end-of-file,
        *  - insertion into the output sequence fails (in this case, the
        *    character that would have been inserted is not extracted), or
-       *  - an exception occurs while getting a character from @a __sb, which
+       *  - an exception occurs while getting a character from @p __sb, which
        *    sets failbit in the error state
        *
        *  If the function inserts no characters, failbit is set.
@@ -252,7 +268,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       operator<<(__streambuf_type* __sb);
       //@}
 
-      // [27.6.2.6] unformatted output functions
+      //@{
       /**
        *  @name Unformatted Output Functions
        *
@@ -270,13 +286,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        *  the stream's exceptions mask, the exception will be rethrown
        *  without completing its actions.
       */
-      //@{
+
       /**
        *  @brief  Simple insertion.
        *  @param  __c  The character to insert.
        *  @return  *this
        *
-       *  Tries to insert @a c.
+       *  Tries to insert @p __c.
        *
        *  @note  This function is not overloaded on signed char and
        *         unsigned char.
@@ -284,7 +300,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       __ostream_type&
       put(char_type __c);
 
-      // Core write functionality, without sentry.
+      /**
+       *  @brief  Core write functionality, without sentry.
+       *  @param  __s  The array to insert.
+       *  @param  __n  Maximum number of characters to insert.
+      */
       void
       _M_write(const char_type* __s, streamsize __n)
       {
@@ -299,10 +319,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        *  @param  __n  Maximum number of characters to insert.
        *  @return  *this
        *
-       *  Characters are copied from @a __s and inserted into the stream until
+       *  Characters are copied from @p __s and inserted into the stream until
        *  one of the following happens:
        *
-       *  - @a __n characters are inserted
+       *  - @p __n characters are inserted
        *  - inserting into the output sequence fails (in this case, badbit
        *    will be set in the stream's error state)
        *
@@ -325,7 +345,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       __ostream_type&
       flush();
 
-      // [27.6.2.4] seek members
       /**
        *  @brief  Getting the current write position.
        *  @return  A file position object.
@@ -429,7 +448,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       { return _M_ok; }
     };
 
-  // [27.6.2.5.4] character insertion templates
   //@{
   /**
    *  @brief  Character inserters
@@ -443,7 +461,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *  padding (as determined by [22.2.2.2.2]).  @c __out.width(0) is then
    *  called.
    *
-   *  If @a __c is of type @c char and the character type of the stream is not
+   *  If @p __c is of type @c char and the character type of the stream is not
    *  @c char, the character is widened before insertion.
   */
   template<typename _CharT, typename _Traits>
@@ -480,12 +498,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *  @param  __out  An output stream.
    *  @param  __s  A character string.
    *  @return  out
-   *  @pre  @a s must be a non-NULL pointer
+   *  @pre  @p __s must be a non-NULL pointer
    *
    *  Behaves like one of the formatted arithmetic inserters described in
    *  std::basic_ostream.  After constructing a sentry object with good
    *  status, this function inserts @c traits::length(__s) characters starting
-   *  at @a __s, widened if necessary, followed by any required padding (as
+   *  at @p __s, widened if necessary, followed by any required padding (as
    *  determined by [22.2.2.2.2]).  @c __out.width(0) is then called.
   */
   template<typename _CharT, typename _Traits>
@@ -529,7 +547,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     { return (__out << reinterpret_cast<const char*>(__s)); }
   //@}
 
-  // [27.6.2.7] standard basic_ostream manipulators
+  // Standard basic_ostream manipulators
+
   /**
    *  @brief  Write a newline and flush the stream.
    *
@@ -546,8 +565,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
   /**
    *  @brief  Write a null character into the output sequence.
    *
-   *  <em>Null character</em> is @c CharT() by definition.  For CharT of @c char,
-   *  this correctly writes the ASCII @c NUL character string terminator.
+   *  <em>Null character</em> is @c CharT() by definition.  For CharT
+   *  of @c char, this correctly writes the ASCII @c NUL character
+   *  string terminator.
   */
   template<typename _CharT, typename _Traits>
     inline basic_ostream<_CharT, _Traits>&
@@ -565,7 +585,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     { return __os.flush(); }
 
 #ifdef __GXX_EXPERIMENTAL_CXX0X__
-  // [27.7.2.9] Rvalue stream insertion
   /**
    *  @brief  Generic inserter for rvalue stream
    *  @param  __os  An input stream.
@@ -583,7 +602,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 #endif // __GXX_EXPERIMENTAL_CXX0X__
 
 _GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
+} // namespace std
 
 #include <bits/ostream.tcc>
 

libstdc++-v3/include/tr2/dynamic_bitset

@@ -738,10 +738,10 @@ public:
 
       /**
        *  @brief  Use a subset of a string.
-       *  @param  str  A string of '0' and '1' characters.
-       *  @param  pos  Index of the first character in @a s to use.
-       *  @param  n    The number of characters to copy.
-       *  @throw  std::out_of_range  If @a pos is bigger the size of @a s.
+       *  @param  __str  A string of '0' and '1' characters.
+       *  @param  __pos  Index of the first character in @p __str to use.
+       *  @param  __n    The number of characters to copy.
+       *  @throw  std::out_of_range  If @p __pos is bigger the size of @p __str.
        *  @throw  std::invalid_argument  If a character appears in the string
        *                                 which is neither '0' nor '1'.
        */
@@ -770,7 +770,7 @@ public:
 
       /**
        *  @brief  Construct from a string.
-       *  @param  str  A string of '0' and '1' characters.
+       *  @param  __str  A string of '0' and '1' characters.
        *  @throw  std::invalid_argument  If a character appears in the string
        *                                 which is neither '0' nor '1'.
        */
@@ -907,7 +907,7 @@ public:
       //@{
       /**
        *  @brief  Operations on dynamic_bitsets.
-       *  @param  rhs  A same-sized dynamic_bitset.
+       *  @param  __rhs  A same-sized dynamic_bitset.
        *
        *  These should be self-explanatory.
        */
@@ -950,7 +950,7 @@ public:
       //@{
       /**
        *  @brief  Operations on dynamic_bitsets.
-       *  @param  position  The number of places to shift.
+       *  @param  __pos The number of places to shift.
        *
        *  These should be self-explanatory.
        */
@@ -995,9 +995,9 @@ public:
 
       /**
        *  @brief Sets a given bit to a particular value.
-       *  @param  position  The index of the bit.
-       *  @param  val  Either true or false, defaults to true.
-       *  @throw  std::out_of_range  If @a pos is bigger the size of the %set.
+       *  @param  __pos  The index of the bit.
+       *  @param  __val  Either true or false, defaults to true.
+       *  @throw  std::out_of_range  If @a __pos is bigger the size of the %set.
        */
       dynamic_bitset<_WordT, _Alloc>&
       set(size_type __pos, bool __val = true)
@@ -1019,10 +1019,10 @@ public:
 
       /**
        *  @brief Sets a given bit to false.
-       *  @param  position  The index of the bit.
-       *  @throw  std::out_of_range  If @a pos is bigger the size of the %set.
+       *  @param  __pos  The index of the bit.
+       *  @throw  std::out_of_range  If @a __pos is bigger the size of the %set.
        *
-       *  Same as writing @c set(pos,false).
+       *  Same as writing @c set(__pos, false).
        */
       dynamic_bitset<_WordT, _Alloc>&
       reset(size_type __pos)
@@ -1045,8 +1045,8 @@ public:
 
       /**
        *  @brief Toggles a given bit to its opposite value.
-       *  @param  position  The index of the bit.
-       *  @throw  std::out_of_range  If @a pos is bigger the size of the %set.
+       *  @param  __pos  The index of the bit.
+       *  @throw  std::out_of_range  If @a __pos is bigger the size of the %set.
        */
       dynamic_bitset<_WordT, _Alloc>&
       flip(size_type __pos)
@@ -1064,7 +1064,7 @@ public:
       //@{
       /**
        *  @brief  Array-indexing support.
-       *  @param  position  Index into the %dynamic_bitset.
+       *  @param  __pos  Index into the %dynamic_bitset.
        *  @return A bool for a 'const %dynamic_bitset'.  For non-const
        *           bitsets, an instance of the reference proxy class.
        *  @note These operators do no range checking and throw no
@@ -1167,9 +1167,9 @@ public:
 
       /**
        *  @brief Tests the value of a bit.
-       *  @param  position  The index of a bit.
-       *  @return  The value at @a pos.
-       *  @throw  std::out_of_range  If @a pos is bigger the size of the %set.
+       *  @param  __pos  The index of a bit.
+       *  @return  The value at @a __pos.
+       *  @throw  std::out_of_range  If @a __pos is bigger the size of the %set.
        */
       bool
       test(size_type __pos) const
@@ -1226,7 +1226,7 @@ public:
       /**
        *  @brief  Finds the index of the next "on" bit after prev.
        *  @return  The index of the next bit set, or size() if not found.
-       *  @param  prev  Where to start searching.
+       *  @param  __prev  Where to start searching.
        *  @sa  find_first
        */
       size_type
@@ -1321,8 +1321,8 @@ public:
   //@{
   /**
    *  @brief  Global bitwise operations on bitsets.
-   *  @param  x  A bitset.
-   *  @param  y  A bitset of the same size as @a x.
+   *  @param  __x  A bitset.
+   *  @param  __y  A bitset of the same size as @a __x.
    *  @return  A new bitset.
    *
    *  These should be self-explanatory.

libstdc++-v3/scripts/run_doxygen

@@ -325,14 +325,6 @@ for f in *__profile_*; do
     newname=`echo $f | sed 's/__profile_/__profile::/'`
     mv $f $newname
 done
-for f in *__atomic0_*; do
-    newname=`echo $f | sed 's/__atomic0_/__atomic0::/'`
-    mv $f $newname
-done
-for f in *__atomic2_*; do
-    newname=`echo $f | sed 's/__atomic2_/__atomic2::/'`
-    mv $f $newname
-done
 
 # Then, clean up other top-level namespaces.
 for f in std_tr1_*; do
@@ -373,11 +365,6 @@ for f in __cxxabiv1_*; do
 done
 
 # Then piecemeal nested classes
-for f in *__future_base_*; do
-    newname=`echo $f | sed 's/__future_base_/__future_base::/'`
-    mv $f $newname
-done
-
 
 
 # Generic removal bits, where there are things in the generated man

libstdc++-v3/testsuite/23_containers/list/requirements/dr438/assign_neg.cc

@@ -18,7 +18,7 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do compile }
-// { dg-error "no matching" "" { target *-*-* } 1551 }
+// { dg-error "no matching" "" { target *-*-* } 1552 }
 
 #include <list>
 

libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_1_neg.cc

@@ -18,7 +18,7 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do compile }
-// { dg-error "no matching" "" { target *-*-* } 1507 }
+// { dg-error "no matching" "" { target *-*-* } 1508 }
 
 #include <list>
 

libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc

@@ -18,7 +18,7 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do compile }
-// { dg-error "no matching" "" { target *-*-* } 1507 }
+// { dg-error "no matching" "" { target *-*-* } 1508 }
 
 #include <list>
 #include <utility>

libstdc++-v3/testsuite/23_containers/list/requirements/dr438/insert_neg.cc

@@ -18,7 +18,7 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do compile }
-// { dg-error "no matching" "" { target *-*-* } 1507 }
+// { dg-error "no matching" "" { target *-*-* } 1508 }
 
 #include <list>