*: 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

20 files changed, 113 insertions, 65 deletions

diff --git a/libstdc++-v3/include/std/atomic b/libstdc++-v3/include/std/atomic
index fc4cb86..71cd444 100644
--- a/libstdc++-v3/include/std/atomic
+++ b/libstdc++-v3/include/std/atomic
@@ -22,7 +22,7 @@
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file atomic
+/** @file include/atomic
  *  This is a Standard C++ Library header.
  */
 
diff --git a/libstdc++-v3/include/std/condition_variable b/libstdc++-v3/include/std/condition_variable
index 71d2133..6b46fe7 100644
--- a/libstdc++-v3/include/std/condition_variable
+++ b/libstdc++-v3/include/std/condition_variable
@@ -22,7 +22,7 @@
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file condition_variable
+/** @file include/condition_variable
  *  This is a Standard C++ Library header.
  */
 
diff --git a/libstdc++-v3/include/std/fstream b/libstdc++-v3/include/std/fstream
index 0ffd33d..ee31fc1 100644
--- a/libstdc++-v3/include/std/fstream
+++ b/libstdc++-v3/include/std/fstream
@@ -24,7 +24,7 @@
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file fstream
+/** @file include/fstream
  *  This is a Standard C++ Library header.
  */
 
diff --git a/libstdc++-v3/include/std/future b/libstdc++-v3/include/std/future
index 6fc3cf0..7b22b78 100644
--- a/libstdc++-v3/include/std/future
+++ b/libstdc++-v3/include/std/future
@@ -22,7 +22,7 @@
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file future
+/** @file include/future
  *  This is a Standard C++ Library header.
  */
 
diff --git a/libstdc++-v3/include/std/iomanip b/libstdc++-v3/include/std/iomanip
index 3dfa2a7..8fc2e72 100644
--- a/libstdc++-v3/include/std/iomanip
+++ b/libstdc++-v3/include/std/iomanip
@@ -24,7 +24,7 @@
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file iomanip
+/** @file include/iomanip
  *  This is a Standard C++ Library header.
  */
 
diff --git a/libstdc++-v3/include/std/ios b/libstdc++-v3/include/std/ios
index d561ac6..8f7975e 100644
--- a/libstdc++-v3/include/std/ios
+++ b/libstdc++-v3/include/std/ios
@@ -23,7 +23,7 @@
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file ios
+/** @file include/ios
  *  This is a Standard C++ Library header.
  */
 
diff --git a/libstdc++-v3/include/std/iosfwd b/libstdc++-v3/include/std/iosfwd
index 9ac72fd..4cbd835 100644
--- a/libstdc++-v3/include/std/iosfwd
+++ b/libstdc++-v3/include/std/iosfwd
@@ -24,7 +24,7 @@
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file iosfwd
+/** @file include/iosfwd
  *  This is a Standard C++ Library header.
  */
 
@@ -43,7 +43,7 @@
 
 _GLIBCXX_BEGIN_NAMESPACE(std)
 
-  /** 
+  /**
    *  @defgroup io I/O
    *
    *  Nearly all of the I/O classes are parameterized on the type of
@@ -71,7 +71,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
    *
    *  @{
   */
-  class ios_base; 
+  class ios_base;
 
   template<typename _CharT, typename _Traits = char_traits<_CharT> >
     class basic_ios;
@@ -122,37 +122,85 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
   template<typename _CharT, typename _Traits = char_traits<_CharT> >
     class ostreambuf_iterator;
 
-  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-  // Not included.   (??? Apparently no LWG number?)
-
-  typedef basic_ios<char> 		ios;		///< @isiosfwd
-  typedef basic_streambuf<char> 	streambuf;	///< @isiosfwd
-  typedef basic_istream<char> 		istream;	///< @isiosfwd
-  typedef basic_ostream<char> 		ostream;	///< @isiosfwd
-  typedef basic_iostream<char> 		iostream;	///< @isiosfwd
-  typedef basic_stringbuf<char> 	stringbuf;	///< @isiosfwd
-  typedef basic_istringstream<char> 	istringstream;	///< @isiosfwd
-  typedef basic_ostringstream<char> 	ostringstream;	///< @isiosfwd
-  typedef basic_stringstream<char> 	stringstream;	///< @isiosfwd
-  typedef basic_filebuf<char> 		filebuf;	///< @isiosfwd
-  typedef basic_ifstream<char> 		ifstream;	///< @isiosfwd
-  typedef basic_ofstream<char> 		ofstream;	///< @isiosfwd
-  typedef basic_fstream<char> 		fstream;	///< @isiosfwd
+
+  /// Base class for @c char streams.
+  typedef basic_ios<char> 		ios; 
+
+  /// Base class for @c char buffers.
+  typedef basic_streambuf<char> 	streambuf;
+
+  /// Base class for @c char input streams.
+  typedef basic_istream<char> 		istream;
+
+  /// Base class for @c char output streams.
+  typedef basic_ostream<char> 		ostream;
+
+  /// Base class for @c char mixed input and output streams.
+  typedef basic_iostream<char> 		iostream;
+
+  /// Class for @c char memory buffers.
+  typedef basic_stringbuf<char> 	stringbuf;
+
+  /// Class for @c char input memory streams.
+  typedef basic_istringstream<char> 	istringstream;
+
+  /// Class for @c char output memory streams.
+  typedef basic_ostringstream<char> 	ostringstream;
+
+  /// Class for @c char mixed input and output memory streams.
+  typedef basic_stringstream<char> 	stringstream;
+
+  /// Class for @c char file buffers.
+  typedef basic_filebuf<char> 		filebuf;
+
+  /// Class for @c char input file streams.
+  typedef basic_ifstream<char> 		ifstream;
+
+  /// Class for @c char output file streams.
+  typedef basic_ofstream<char> 		ofstream;
+
+  /// Class for @c char mixed input and output file streams.
+  typedef basic_fstream<char> 		fstream;
 
 #ifdef _GLIBCXX_USE_WCHAR_T
-  typedef basic_ios<wchar_t> 		wios;		///< @isiosfwd
-  typedef basic_streambuf<wchar_t> 	wstreambuf;	///< @isiosfwd
-  typedef basic_istream<wchar_t> 	wistream;	///< @isiosfwd
-  typedef basic_ostream<wchar_t> 	wostream;	///< @isiosfwd
-  typedef basic_iostream<wchar_t> 	wiostream;	///< @isiosfwd
-  typedef basic_stringbuf<wchar_t> 	wstringbuf;	///< @isiosfwd
-  typedef basic_istringstream<wchar_t> 	wistringstream;	///< @isiosfwd
-  typedef basic_ostringstream<wchar_t> 	wostringstream;	///< @isiosfwd
-  typedef basic_stringstream<wchar_t> 	wstringstream;	///< @isiosfwd
-  typedef basic_filebuf<wchar_t> 	wfilebuf;	///< @isiosfwd
-  typedef basic_ifstream<wchar_t> 	wifstream;	///< @isiosfwd
-  typedef basic_ofstream<wchar_t> 	wofstream;	///< @isiosfwd
-  typedef basic_fstream<wchar_t> 	wfstream;	///< @isiosfwd
+  /// Base class for @c wchar_t streams.
+  typedef basic_ios<wchar_t> 		wios;
+
+  /// Base class for @c wchar_t buffers.
+  typedef basic_streambuf<wchar_t> 	wstreambuf;
+
+  /// Base class for @c wchar_t input streams.
+  typedef basic_istream<wchar_t> 	wistream;
+
+  /// Base class for @c wchar_t output streams.
+  typedef basic_ostream<wchar_t> 	wostream;
+
+  /// Base class for @c wchar_t mixed input and output streams.
+  typedef basic_iostream<wchar_t> 	wiostream;
+
+  /// Class for @c wchar_t memory buffers.
+  typedef basic_stringbuf<wchar_t> 	wstringbuf;
+
+  /// Class for @c wchar_t input memory streams.
+  typedef basic_istringstream<wchar_t> 	wistringstream;
+
+  /// Class for @c wchar_t output memory streams.
+  typedef basic_ostringstream<wchar_t> 	wostringstream;
+
+  /// Class for @c wchar_t mixed input and output memory streams.
+  typedef basic_stringstream<wchar_t> 	wstringstream;
+
+  /// Class for @c wchar_t file buffers.
+  typedef basic_filebuf<wchar_t> 	wfilebuf;
+
+  /// Class for @c wchar_t input file streams.
+  typedef basic_ifstream<wchar_t> 	wifstream;
+
+  /// Class for @c wchar_t output file streams.
+  typedef basic_ofstream<wchar_t> 	wofstream;
+
+  /// Class for @c wchar_t mixed input and output file streams.
+  typedef basic_fstream<wchar_t> 	wfstream;
 #endif
   /** @}  */
 
diff --git a/libstdc++-v3/include/std/iostream b/libstdc++-v3/include/std/iostream
index 9212ea8..6a991ca 100644
--- a/libstdc++-v3/include/std/iostream
+++ b/libstdc++-v3/include/std/iostream
@@ -23,8 +23,8 @@
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file iostream
- *  This is a Standard C++ Library header. 
+/** @file include/iostream
+ *  This is a Standard C++ Library header.
  */
 
 //
@@ -56,16 +56,16 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
    *  linked to above.
   */
   //@{
-  extern istream cin;		///< Linked to standard input
-  extern ostream cout;		///< Linked to standard output
-  extern ostream cerr;		///< Linked to standard error (unbuffered)
-  extern ostream clog;		///< Linked to standard error (buffered)
+  extern istream cin;		/// Linked to standard input
+  extern ostream cout;		/// Linked to standard output
+  extern ostream cerr;		/// Linked to standard error (unbuffered)
+  extern ostream clog;		/// Linked to standard error (buffered)
 
 #ifdef _GLIBCXX_USE_WCHAR_T
-  extern wistream wcin;		///< Linked to standard input
-  extern wostream wcout;	///< Linked to standard output
-  extern wostream wcerr;	///< Linked to standard error (unbuffered)
-  extern wostream wclog;	///< Linked to standard error (buffered)
+  extern wistream wcin;		/// Linked to standard input
+  extern wostream wcout;	/// Linked to standard output
+  extern wostream wcerr;	/// Linked to standard error (unbuffered)
+  extern wostream wclog;	/// Linked to standard error (buffered)
 #endif
   //@}
 
diff --git a/libstdc++-v3/include/std/istream b/libstdc++-v3/include/std/istream
index 542396b..df75718 100644
--- a/libstdc++-v3/include/std/istream
+++ b/libstdc++-v3/include/std/istream
@@ -28,7 +28,7 @@
 // ISO C++ 14882: 27.6.1  Input streams
 //
 
-/** @file istream
+/** @file include/istream
  *  This is a Standard C++ Library header.
  */
 
diff --git a/libstdc++-v3/include/std/limits b/libstdc++-v3/include/std/limits
index 4594c93..7719006 100644
--- a/libstdc++-v3/include/std/limits
+++ b/libstdc++-v3/include/std/limits
@@ -23,7 +23,7 @@
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file limits
+/** @file include/limits
  *  This is a Standard C++ Library header.
  */
 
@@ -154,11 +154,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
   */
   enum float_round_style
   {
-    round_indeterminate       = -1,    ///< Self-explanatory.
-    round_toward_zero         = 0,     ///< Self-explanatory.
-    round_to_nearest          = 1,     ///< To the nearest representable value.
-    round_toward_infinity     = 2,     ///< Self-explanatory.
-    round_toward_neg_infinity = 3      ///< Self-explanatory.
+    round_indeterminate       = -1,    /// Intermediate.
+    round_toward_zero         = 0,     /// To zero.
+    round_to_nearest          = 1,     /// To the nearest representable value.
+    round_toward_infinity     = 2,     /// To infinity.
+    round_toward_neg_infinity = 3      /// To negative infinity.
   };
 
   /**
diff --git a/libstdc++-v3/include/std/locale b/libstdc++-v3/include/std/locale
index 3504b77..55aad34 100644
--- a/libstdc++-v3/include/std/locale
+++ b/libstdc++-v3/include/std/locale
@@ -28,7 +28,7 @@
 // ISO C++ 14882: 22.1  Locales
 //
 
-/** @file locale
+/** @file include/locale
  *  This is a Standard C++ Library header.
  */
 
diff --git a/libstdc++-v3/include/std/mutex b/libstdc++-v3/include/std/mutex
index 4c15511..e8f64a4 100644
--- a/libstdc++-v3/include/std/mutex
+++ b/libstdc++-v3/include/std/mutex
@@ -23,7 +23,7 @@
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file mutex
+/** @file include/mutex
  *  This is a Standard C++ Library header.
  */
 
diff --git a/libstdc++-v3/include/std/ostream b/libstdc++-v3/include/std/ostream
index 17426f4..632a0e0 100644
--- a/libstdc++-v3/include/std/ostream
+++ b/libstdc++-v3/include/std/ostream
@@ -24,7 +24,7 @@
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file ostream
+/** @file include/ostream
  *  This is a Standard C++ Library header.
  */
 
diff --git a/libstdc++-v3/include/std/ratio b/libstdc++-v3/include/std/ratio
index 80c5d15..2eefdb7 100644
--- a/libstdc++-v3/include/std/ratio
+++ b/libstdc++-v3/include/std/ratio
@@ -22,7 +22,7 @@
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file ratio
+/** @file include/ratio
  *  This is a Standard C++ Library header.
  */
 
diff --git a/libstdc++-v3/include/std/sstream b/libstdc++-v3/include/std/sstream
index f000ac0..7f9091c 100644
--- a/libstdc++-v3/include/std/sstream
+++ b/libstdc++-v3/include/std/sstream
@@ -23,7 +23,7 @@
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file sstream
+/** @file include/sstream
  *  This is a Standard C++ Library header.
  */
 
diff --git a/libstdc++-v3/include/std/stdexcept b/libstdc++-v3/include/std/stdexcept
index 9f5c976..351b8e5 100644
--- a/libstdc++-v3/include/std/stdexcept
+++ b/libstdc++-v3/include/std/stdexcept
@@ -22,7 +22,7 @@
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file stdexcept
+/** @file include/stdexcept
  *  This is a Standard C++ Library header.
  */
 
diff --git a/libstdc++-v3/include/std/streambuf b/libstdc++-v3/include/std/streambuf
index 178a1e7..e95a752 100644
--- a/libstdc++-v3/include/std/streambuf
+++ b/libstdc++-v3/include/std/streambuf
@@ -23,7 +23,7 @@
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file streambuf
+/** @file include/streambuf
  *  This is a Standard C++ Library header.
  */
 
diff --git a/libstdc++-v3/include/std/system_error b/libstdc++-v3/include/std/system_error
index ce4e238..73aaa79 100644
--- a/libstdc++-v3/include/std/system_error
+++ b/libstdc++-v3/include/std/system_error
@@ -22,7 +22,7 @@
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file system_error
+/** @file include/system_error
  *  This is a Standard C++ Library header.
  */
 
diff --git a/libstdc++-v3/include/std/thread b/libstdc++-v3/include/std/thread
index 944d0a8..8a626fe 100644
--- a/libstdc++-v3/include/std/thread
+++ b/libstdc++-v3/include/std/thread
@@ -22,7 +22,7 @@
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file thread
+/** @file include/thread
  *  This is a Standard C++ Library header.
  */
 
diff --git a/libstdc++-v3/include/std/valarray b/libstdc++-v3/include/std/valarray
index d67eae2..40e78e7 100644
--- a/libstdc++-v3/include/std/valarray
+++ b/libstdc++-v3/include/std/valarray
@@ -24,7 +24,7 @@
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file valarray
+/** @file include/valarray
  *  This is a Standard C++ Library header. 
  */