*: Use headername alias to associate private includes to public includes.

2010-11-18  Benjamin Kosnik  <bkoz@redhat.com>

	* config/*/*: Use headername alias to associate private includes
	to public includes.
	* include/*/*: Same.

	* scripts/run_doxygen: Update for doxygen 1.7.2.
	* doc/doxygen/user.cfg.in: Same.
	* doc/doxygen/TODO: Remove.

	* testsuite/*/std_c++0x_neg.cc: Adjust line number.

From-SVN: r168046

14 files changed, 88 insertions, 82 deletions

diff --git a/libstdc++-v3/include/ext/atomicity.h b/libstdc++-v3/include/ext/atomicity.h
index 5cb419e..c853e84 100644
--- a/libstdc++-v3/include/ext/atomicity.h
+++ b/libstdc++-v3/include/ext/atomicity.h
@@ -22,9 +22,8 @@
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file atomicity.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
+/** @file ext/atomicity.h
+ *  This file is a GNU extension to the Standard C++ Library.
  */
 
 #ifndef _GLIBCXX_ATOMICITY_H
diff --git a/libstdc++-v3/include/ext/cast.h b/libstdc++-v3/include/ext/cast.h
index 8fd8cc9..f58c0fc 100644
--- a/libstdc++-v3/include/ext/cast.h
+++ b/libstdc++-v3/include/ext/cast.h
@@ -22,8 +22,13 @@
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-#ifndef _CAST_H
-#define _CAST_H 1
+/** @file ext/cast.h
+ *  This is an internal header file, included by other library headers.
+ *  Do not attempt to use it directly. @headername{ext/pointer.h}
+ */
+
+#ifndef _GLIBCXX_CAST_H
+#define _GLIBCXX_CAST_H 1
 
 _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
 
@@ -110,4 +115,4 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
 
 _GLIBCXX_END_NAMESPACE
 
-#endif // _CAST_H
+#endif // __GLIBCXX_CAST_H
diff --git a/libstdc++-v3/include/ext/concurrence.h b/libstdc++-v3/include/ext/concurrence.h
index b665b41..b6f86a4 100644
--- a/libstdc++-v3/include/ext/concurrence.h
+++ b/libstdc++-v3/include/ext/concurrence.h
@@ -23,9 +23,8 @@
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file concurrence.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
+/** @file ext/concurrence.h
+ *  This file is a GNU extension to the Standard C++ Library.
  */
 
 #ifndef _CONCURRENCE_H
diff --git a/libstdc++-v3/include/ext/debug_allocator.h b/libstdc++-v3/include/ext/debug_allocator.h
index 18d8049..d084d74 100644
--- a/libstdc++-v3/include/ext/debug_allocator.h
+++ b/libstdc++-v3/include/ext/debug_allocator.h
@@ -37,7 +37,6 @@
 
 /** @file ext/debug_allocator.h
  *  This file is a GNU extension to the Standard C++ Library.
- *  You should only include this header if you are using GCC 3 or later.
  */
 
 #ifndef _DEBUG_ALLOCATOR_H
diff --git a/libstdc++-v3/include/ext/extptr_allocator.h b/libstdc++-v3/include/ext/extptr_allocator.h
index d9e8cda..d3caf8a 100644
--- a/libstdc++-v3/include/ext/extptr_allocator.h
+++ b/libstdc++-v3/include/ext/extptr_allocator.h
@@ -23,8 +23,10 @@
 // <http://www.gnu.org/licenses/>.
 
 /**
- * @file ext/extptr_allocator.h
- * @author Bob Walters
+ *  @file ext/extptr_allocator.h
+ *  This file is a GNU extension to the Standard C++ Library.
+ *
+ *  @author Bob Walters
  *
  * An example allocator which uses an alternative pointer type from
  * bits/pointer.h.  Supports test cases which confirm container support
diff --git a/libstdc++-v3/include/ext/pointer.h b/libstdc++-v3/include/ext/pointer.h
index 8055df2..692a1c8 100644
--- a/libstdc++-v3/include/ext/pointer.h
+++ b/libstdc++-v3/include/ext/pointer.h
@@ -23,8 +23,10 @@
 // <http://www.gnu.org/licenses/>.
 
 /**
- * @file ext/pointer.h
- * @author Bob Walters
+ *  @file ext/pointer.h
+ *  This file is a GNU extension to the Standard C++ Library.
+ *
+ *  @author Bob Walters
  *
  * Provides reusable _Pointer_adapter for assisting in the development of
  * custom pointer types that can be used with the standard containers via
diff --git a/libstdc++-v3/include/ext/rc_string_base.h b/libstdc++-v3/include/ext/rc_string_base.h
index 9831037..b4037d6 100644
--- a/libstdc++-v3/include/ext/rc_string_base.h
+++ b/libstdc++-v3/include/ext/rc_string_base.h
@@ -24,9 +24,8 @@
 // <http://www.gnu.org/licenses/>.
 
 /** @file ext/rc_string_base.h
- *  This file is a GNU extension to the Standard C++ Library.
  *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
+ *  Do not attempt to use it directly. @headername{ext/vstring.h}
  */
 
 #ifndef _RC_STRING_BASE_H
@@ -115,7 +114,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
 	    size_type	    _M_capacity;
 	    _Atomic_word    _M_refcount;
 	  }                 _M_info;
-	  
+
 	  // Only for alignment purposes.
 	  _CharT            _M_align;
 	};
@@ -132,10 +131,10 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
 	  __atomic_add_dispatch(&_M_info._M_refcount, 1);
 	  return _M_refdata();
 	}  // XXX MT
-	
+
 	void
 	_M_set_length(size_type __n)
-	{ 
+	{
 	  _M_info._M_refcount = 0;  // One reference.
 	  _M_info._M_length = __n;
 	  // grrr. (per 21.3.4)
@@ -193,7 +192,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
       _M_grab(const _Alloc& __alloc) const
       {
 	return (!_M_is_leaked() && _M_get_allocator() == __alloc)
-	        ? _M_rep()->_M_refcopy() : _M_rep()->_M_clone(__alloc);
+		? _M_rep()->_M_refcopy() : _M_rep()->_M_clone(__alloc);
       }
 
       void
@@ -225,19 +224,19 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
       // _S_construct_aux is used to implement the 21.3.1 para 15 which
       // requires special behaviour if _InIterator is an integral type
       template<typename _InIterator>
-        static _CharT*
-        _S_construct_aux(_InIterator __beg, _InIterator __end,
+	static _CharT*
+	_S_construct_aux(_InIterator __beg, _InIterator __end,
 			 const _Alloc& __a, std::__false_type)
 	{
-          typedef typename iterator_traits<_InIterator>::iterator_category _Tag;
-          return _S_construct(__beg, __end, __a, _Tag());
+	  typedef typename iterator_traits<_InIterator>::iterator_category _Tag;
+	  return _S_construct(__beg, __end, __a, _Tag());
 	}
 
       // _GLIBCXX_RESOLVE_LIB_DEFECTS
       // 438. Ambiguity in the "do the right thing" clause
       template<typename _Integer>
-        static _CharT*
-        _S_construct_aux(_Integer __beg, _Integer __end,
+	static _CharT*
+	_S_construct_aux(_Integer __beg, _Integer __end,
 			 const _Alloc& __a, std::__true_type)
 	{ return _S_construct_aux_2(static_cast<size_type>(__beg),
 				    __end, __a); }
@@ -247,24 +246,24 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
       { return _S_construct(__req, __c, __a); }
 
       template<typename _InIterator>
-        static _CharT*
-        _S_construct(_InIterator __beg, _InIterator __end, const _Alloc& __a)
+	static _CharT*
+	_S_construct(_InIterator __beg, _InIterator __end, const _Alloc& __a)
 	{
 	  typedef typename std::__is_integer<_InIterator>::__type _Integral;
 	  return _S_construct_aux(__beg, __end, __a, _Integral());
-        }
+	}
 
       // For Input Iterators, used in istreambuf_iterators, etc.
       template<typename _InIterator>
-        static _CharT*
-         _S_construct(_InIterator __beg, _InIterator __end, const _Alloc& __a,
+	static _CharT*
+	 _S_construct(_InIterator __beg, _InIterator __end, const _Alloc& __a,
 		      std::input_iterator_tag);
-      
+
       // For forward_iterators up to random_access_iterators, used for
       // string::iterator, _CharT*, etc.
       template<typename _FwdIterator>
-        static _CharT*
-        _S_construct(_FwdIterator __beg, _FwdIterator __end, const _Alloc& __a,
+	static _CharT*
+	_S_construct(_FwdIterator __beg, _FwdIterator __end, const _Alloc& __a,
 		     std::forward_iterator_tag);
 
       static _CharT*
@@ -322,11 +321,11 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
       __rc_string_base(size_type __n, _CharT __c, const _Alloc& __a);
 
       template<typename _InputIterator>
-        __rc_string_base(_InputIterator __beg, _InputIterator __end,
+	__rc_string_base(_InputIterator __beg, _InputIterator __end,
 			 const _Alloc& __a);
 
       ~__rc_string_base()
-      { _M_dispose(); }      
+      { _M_dispose(); }
 
       allocator_type&
       _M_get_allocator()
@@ -348,7 +347,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
       void
       _M_mutate(size_type __pos, size_type __len1, const _CharT* __s,
 		size_type __len2);
-      
+
       void
       _M_erase(size_type __pos, size_type __n);
 
@@ -604,7 +603,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
 	_M_set_sharable();
       if (__rcs._M_is_leaked())
 	__rcs._M_set_sharable();
-      
+
       _CharT* __tmp = _M_data();
       _M_data(__rcs._M_data());
       __rcs._M_data(__tmp);
@@ -613,7 +612,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
       // 431. Swapping containers with unequal allocators.
       std::__alloc_swap<allocator_type>::_S_do_it(_M_get_allocator(),
 						  __rcs._M_get_allocator());
-    } 
+    }
 
   template<typename _CharT, typename _Traits, typename _Alloc>
     void
@@ -636,7 +635,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
       // Make sure we don't shrink below the current size.
       if (__res < _M_length())
 	__res = _M_length();
-      
+
       if (__res != _M_capacity() || _M_is_shared())
 	{
 	  _CharT* __tmp = _M_rep()->_M_clone(_M_get_allocator(),
@@ -653,10 +652,10 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
 	      size_type __len2)
     {
       const size_type __how_much = _M_length() - __pos - __len1;
-      
+
       _Rep* __r = _Rep::_S_create(_M_length() + __len2 - __len1,
 				  _M_capacity(), _M_get_allocator());
-      
+
       if (__pos)
 	_S_copy(__r->_M_refdata(), _M_data(), __pos);
       if (__s && __len2)
@@ -664,7 +663,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
       if (__how_much)
 	_S_copy(__r->_M_refdata() + __pos + __len2,
 		_M_data() + __pos + __len1, __how_much);
-      
+
       _M_dispose();
       _M_data(__r->_M_refdata());
     }
@@ -676,7 +675,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
     {
       const size_type __new_size = _M_length() - __n;
       const size_type __how_much = _M_length() - __pos - __n;
-      
+
       if (_M_is_shared())
 	{
 	  // Must reallocate.
@@ -699,7 +698,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
 		  _M_data() + __pos + __n, __how_much);
 	}
 
-      _M_rep()->_M_set_length(__new_size);      
+      _M_rep()->_M_set_length(__new_size);
     }
 
   template<>
diff --git a/libstdc++-v3/include/ext/ropeimpl.h b/libstdc++-v3/include/ext/ropeimpl.h
index e79bca4..75d3e86 100644
--- a/libstdc++-v3/include/ext/ropeimpl.h
+++ b/libstdc++-v3/include/ext/ropeimpl.h
@@ -38,7 +38,7 @@
 
 /** @file ropeimpl.h
  *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
+ *  Do not attempt to use it directly. @headername{ext/rope}
  */
 
 #include <cstdio>
diff --git a/libstdc++-v3/include/ext/sso_string_base.h b/libstdc++-v3/include/ext/sso_string_base.h
index 6168631..4899e1f 100644
--- a/libstdc++-v3/include/ext/sso_string_base.h
+++ b/libstdc++-v3/include/ext/sso_string_base.h
@@ -24,9 +24,8 @@
 // <http://www.gnu.org/licenses/>.
 
 /** @file ext/sso_string_base.h
- *  This file is a GNU extension to the Standard C++ Library.
  *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
+ *  Do not attempt to use it directly. @headername{ext/vstring.h}
  */
 
 #ifndef _SSO_STRING_BASE_H
diff --git a/libstdc++-v3/include/ext/string_conversions.h b/libstdc++-v3/include/ext/string_conversions.h
index a4276f3..196295c 100644
--- a/libstdc++-v3/include/ext/string_conversions.h
+++ b/libstdc++-v3/include/ext/string_conversions.h
@@ -22,6 +22,10 @@
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
+/** @file ext/string_conversions.h
+ *  This file is a GNU extension to the Standard C++ Library.
+ */
+
 #ifndef _STRING_CONVERSIONS_H
 #define _STRING_CONVERSIONS_H 1
 
diff --git a/libstdc++-v3/include/ext/typelist.h b/libstdc++-v3/include/ext/typelist.h
index ff1cac7..2fe6f61 100644
--- a/libstdc++-v3/include/ext/typelist.h
+++ b/libstdc++-v3/include/ext/typelist.h
@@ -33,9 +33,11 @@
 // purpose. It is provided "as is" without express or implied warranty.
 
 /**
- * @file typelist.h
- * Contains typelist_chain definitions.
- * Typelists are an idea by Andrei Alexandrescu.
+ *  @file ext/typelist.h
+ *  This file is a GNU extension to the Standard C++ Library.
+ *
+ *  Contains typelist_chain definitions.
+ *  Typelists are an idea by Andrei Alexandrescu.
  */
 
 #ifndef _TYPELIST_H
@@ -89,7 +91,7 @@ namespace typelist
 
   template<typename Typelist, typename T>
     struct contains;
- 
+
   template<typename Typelist, template<typename T> class Pred>
     struct filter;
 
@@ -120,7 +122,7 @@ namespace typelist
   template<typename T1, typename T2, typename T3, typename T4, typename T5>
     struct create5;
 
-  template<typename T1, typename T2, typename T3, 
+  template<typename T1, typename T2, typename T3,
 	   typename T4, typename T5, typename T6>
     struct create6;
 } // namespace typelist
@@ -130,7 +132,7 @@ _GLIBCXX_END_NAMESPACE
 
 _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
 
-namespace typelist 
+namespace typelist
 {
 namespace detail
 {
@@ -245,7 +247,7 @@ namespace detail
     {
     private:
       typedef typename append_typelist_<Tl>::type 		rest_type;
-      
+
     public:
       typedef typename append<Hd, node<rest_type> >::type::root	type;
     };
@@ -270,7 +272,7 @@ namespace detail
 	  value = contains_<Tl, T>::value
 	};
     };
-  
+
   template<typename Tl, typename T>
     struct contains_<chain<T, Tl>, T>
     {
@@ -297,7 +299,7 @@ namespace detail
 	{
 	  include_hd = Pred<Hd>::value
 	};
-      
+
       typedef typename chain_filter_<Tl, Pred>::type 		rest_type;
       typedef chain<Hd, rest_type> 				chain_type;
 
@@ -313,7 +315,7 @@ namespace detail
     {
       typedef Hd 						type;
     };
-  
+
   template<typename Hd, typename Tl, int i>
     struct chain_at_index_<chain<Hd, Tl>, i>
     {
@@ -328,7 +330,7 @@ namespace detail
     {
       typedef null_type 					type;
     };
-  
+
   template<class Hd, class Tl, template<typename T> class Transform>
     struct chain_transform_<chain<Hd, Tl>, Transform>
     {
@@ -462,7 +464,7 @@ namespace typelist
     private:
       typedef typename Typelist::root 				root_type;
       typedef detail::chain_at_index_<root_type, i> 		index_type;
-      
+
     public:
       typedef typename index_type::type 			type;
     };
@@ -523,14 +525,14 @@ namespace typelist
       typedef node<_GLIBCXX_TYPELIST_CHAIN4(T1,T2,T3,T4)>	type;
     };
 
-  template<typename T1, typename T2, typename T3, 
+  template<typename T1, typename T2, typename T3,
 	   typename T4, typename T5>
     struct create5
     {
       typedef node<_GLIBCXX_TYPELIST_CHAIN5(T1,T2,T3,T4,T5)>	type;
     };
 
-  template<typename T1, typename T2, typename T3, 
+  template<typename T1, typename T2, typename T3,
 	   typename T4, typename T5, typename T6>
     struct create6
     {
@@ -541,4 +543,3 @@ _GLIBCXX_END_NAMESPACE
 
 
 #endif
-
diff --git a/libstdc++-v3/include/ext/vstring.tcc b/libstdc++-v3/include/ext/vstring.tcc
index 99193896..6908e1f 100644
--- a/libstdc++-v3/include/ext/vstring.tcc
+++ b/libstdc++-v3/include/ext/vstring.tcc
@@ -23,9 +23,8 @@
 // <http://www.gnu.org/licenses/>.
 
 /** @file ext/vstring.tcc
- *  This file is a GNU extension to the Standard C++ Library.
  *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
+ *  Do not attempt to use it directly. @headername{ext/vstring.h}
  */
 
 #ifndef _VSTRING_TCC
diff --git a/libstdc++-v3/include/ext/vstring_fwd.h b/libstdc++-v3/include/ext/vstring_fwd.h
index c2a31d4..a860ea8 100644
--- a/libstdc++-v3/include/ext/vstring_fwd.h
+++ b/libstdc++-v3/include/ext/vstring_fwd.h
@@ -23,9 +23,8 @@
 // <http://www.gnu.org/licenses/>.
 
 /** @file ext/vstring_fwd.h
- *  This file is a GNU extension to the Standard C++ Library.
  *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
+ *  Do not attempt to use it directly. @headername{ext/vstring.h}
  */
 
 #ifndef _VSTRING_FWD_H
diff --git a/libstdc++-v3/include/ext/vstring_util.h b/libstdc++-v3/include/ext/vstring_util.h
index 6779f4d..d9307cc 100644
--- a/libstdc++-v3/include/ext/vstring_util.h
+++ b/libstdc++-v3/include/ext/vstring_util.h
@@ -24,9 +24,8 @@
 // <http://www.gnu.org/licenses/>.
 
 /** @file ext/vstring_util.h
- *  This file is a GNU extension to the Standard C++ Library.
  *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
+ *  Do not attempt to use it directly. @headername{ext/vstring.h}
  */
 
 #ifndef _VSTRING_UTIL_H
@@ -52,10 +51,10 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
     {
       typedef typename _Alloc::template rebind<_CharT>::other _CharT_alloc_type;
 
-      typedef _Traits					    traits_type;      
+      typedef _Traits					    traits_type;
       typedef typename _Traits::char_type		    value_type;
       typedef typename _CharT_alloc_type::size_type	    size_type;
-      typedef typename _CharT_alloc_type::difference_type   difference_type;      
+      typedef typename _CharT_alloc_type::difference_type   difference_type;
       typedef typename _CharT_alloc_type::pointer	    pointer;
       typedef typename _CharT_alloc_type::const_pointer	    const_pointer;
 
@@ -64,29 +63,29 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
       __normal_iterator<pointer, __gnu_cxx::
 			__versa_string<_CharT, _Traits, _Alloc,
 				       __sso_string_base> >
-        __sso_iterator;
+	__sso_iterator;
       typedef __gnu_cxx::
       __normal_iterator<const_pointer, __gnu_cxx::
 			__versa_string<_CharT, _Traits, _Alloc,
 				       __sso_string_base> >
-        __const_sso_iterator;
+	__const_sso_iterator;
 
       // For __rc_string.
       typedef __gnu_cxx::
       __normal_iterator<pointer, __gnu_cxx::
 			__versa_string<_CharT, _Traits, _Alloc,
 				       __rc_string_base> >
-        __rc_iterator;
+	__rc_iterator;
       typedef __gnu_cxx::
       __normal_iterator<const_pointer, __gnu_cxx::
 			__versa_string<_CharT, _Traits, _Alloc,
 				       __rc_string_base> >
-        __const_rc_iterator;
+	__const_rc_iterator;
 
-      // NB:  When the allocator is empty, deriving from it saves space 
+      // NB:  When the allocator is empty, deriving from it saves space
       // (http://www.cantrip.org/emptyopt.html).
       template<typename _Alloc1>
-        struct _Alloc_hider
+	struct _Alloc_hider
 	: public _Alloc1
 	{
 	  _Alloc_hider(_CharT* __ptr)
@@ -115,7 +114,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
 	if (__n == 1)
 	  traits_type::assign(*__d, *__s);
 	else
-	  traits_type::move(__d, __s, __n);	  
+	  traits_type::move(__d, __s, __n);
       }
 
       static void
@@ -124,15 +123,15 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
 	if (__n == 1)
 	  traits_type::assign(*__d, __c);
 	else
-	  traits_type::assign(__d, __n, __c);	  
+	  traits_type::assign(__d, __n, __c);
       }
 
       // _S_copy_chars is a separate template to permit specialization
       // to optimize for the common case of pointers as iterators.
       template<typename _Iterator>
-        static void
-        _S_copy_chars(_CharT* __p, _Iterator __k1, _Iterator __k2)
-        {
+	static void
+	_S_copy_chars(_CharT* __p, _Iterator __k1, _Iterator __k2)
+	{
 	  for (; __k1 != __k2; ++__k1, ++__p)
 	    traits_type::assign(*__p, *__k1); // These types are off.
 	}