diff options
Diffstat (limited to 'libstdc++-v3/include/std')
| -rw-r--r-- | libstdc++-v3/include/std/bitset | 12 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/fstream | 32 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/istream | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/limits | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/sstream | 22 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/streambuf | 21 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/tuple | 12 |
7 files changed, 12 insertions, 95 deletions
diff --git a/libstdc++-v3/include/std/bitset b/libstdc++-v3/include/std/bitset index 9a984d03..deaa92d 100644 --- a/libstdc++-v3/include/std/bitset +++ b/libstdc++-v3/include/std/bitset @@ -1,6 +1,6 @@ // <bitset> -*- C++ -*- -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -65,12 +65,10 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) /** - * @if maint * Base class, general case. It is a class inveriant that _Nw will be * nonnegative. * * See documentation for bitset. - * @endif */ template<size_t _Nw> struct _Base_bitset @@ -330,11 +328,9 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) } // end _M_do_find_next /** - * @if maint * Base class, specialization for a single word. * * See documentation for bitset. - * @endif */ template<> struct _Base_bitset<1> @@ -460,11 +456,9 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) }; /** - * @if maint * Base class, specialization for no storage (zero-length %bitset). * * See documentation for bitset. - * @endif */ template<> struct _Base_bitset<0> @@ -643,7 +637,6 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) * Also see http://gcc.gnu.org/onlinedocs/libstdc++/ext/sgiexts.html#ch23 * for a description of extensions. * - * @if maint * Most of the actual code isn't contained in %bitset<> itself, but in the * base class _Base_bitset. The base class works with whole words, not with * individual bits. This allows us to specialize _Base_bitset for the @@ -652,7 +645,6 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) * Extra confusion can result due to the fact that the storage for * _Base_bitset @e is a regular array, and is indexed as such. This is * carefully encapsulated. - * @endif */ template<size_t _Nb> class bitset @@ -991,13 +983,11 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) * @note These operators do no range checking and throw no exceptions, * as required by DR 11 to the standard. * - * @if maint * _GLIBCXX_RESOLVE_LIB_DEFECTS Note that this implementation already * resolves DR 11 (items 1 and 2), but does not do the range-checking * required by that DR's resolution. -pme * The DR has since been changed: range-checking is a precondition * (users' responsibility), and these functions must not throw. -pme - * @endif */ reference operator[](size_t __position) diff --git a/libstdc++-v3/include/std/fstream b/libstdc++-v3/include/std/fstream index af7635e..fc2eca1 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 +// 2006, 2007, 2008 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -91,11 +91,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // External buffer. __file_type _M_file; - /** - * @if maint - * Place to stash in || out || in | out settings for current filebuf. - * @endif - */ + /// Place to stash in || out || in | out settings for current filebuf. ios_base::openmode _M_mode; // Beginning state type for codecvt. @@ -110,19 +106,13 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // to eback() and _M_ext_buf. __state_type _M_state_last; - /** - * @if maint - * Pointer to the beginning of internal buffer. - * @endif - */ + /// Pointer to the beginning of internal buffer. char_type* _M_buf; /** - * @if maint * Actual size of internal buffer. This number is equal to the size * of the put area + 1 position, reserved for the overflow char of * a full area. - * @endif */ size_t _M_buf_size; @@ -130,24 +120,20 @@ _GLIBCXX_BEGIN_NAMESPACE(std) bool _M_buf_allocated; /** - * @if maint * _M_reading == false && _M_writing == false for 'uncommitted' mode; * _M_reading == true for 'read' mode; * _M_writing == true for 'write' mode; * * NB: _M_reading == true && _M_writing == true is unused. - * @endif */ bool _M_reading; bool _M_writing; //@{ /** - * @if maint * Necessary bits for putback buffer management. * * @note pbacks of over one character are not currently supported. - * @endif */ char_type _M_pback; char_type* _M_pback_cur_save; @@ -159,37 +145,29 @@ _GLIBCXX_BEGIN_NAMESPACE(std) const __codecvt_type* _M_codecvt; /** - * @if maint * Buffer for external characters. Used for input when * codecvt::always_noconv() == false. When valid, this corresponds * to eback(). - * @endif */ char* _M_ext_buf; /** - * @if maint * Size of buffer held by _M_ext_buf. - * @endif */ streamsize _M_ext_buf_size; /** - * @if maint * Pointers into the buffer held by _M_ext_buf that delimit a * subsequence of bytes that have been read but not yet converted. * When valid, _M_ext_next corresponds to egptr(). - * @endif */ const char* _M_ext_next; char* _M_ext_end; /** - * @if maint * Initializes pback buffers, and moves normal buffers to safety. * Assumptions: * _M_in_cur has already been moved back - * @endif */ void _M_create_pback() @@ -204,11 +182,9 @@ _GLIBCXX_BEGIN_NAMESPACE(std) } /** - * @if maint * Deactivates pback buffer contents, and restores normal buffer. * Assumptions: * The pback buffer has only moved forward. - * @endif */ void _M_destroy_pback() throw() @@ -384,7 +360,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std) _M_terminate_output(); /** - * @if maint * This function sets the pointers of the internal buffer, both get * and put areas. Typically: * @@ -395,7 +370,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * NB: epptr() - pbase() == _M_buf_size - 1, since _M_buf_size * reflects the actual allocated memory and the last cell is reserved * for the overflow char of a full put area. - * @endif */ void _M_set_buffer(streamsize __off) diff --git a/libstdc++-v3/include/std/istream b/libstdc++-v3/include/std/istream index 8b1666c..72eb5d8 100644 --- a/libstdc++-v3/include/std/istream +++ b/libstdc++-v3/include/std/istream @@ -77,10 +77,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) protected: // Data Members: /** - * @if maint * The number of characters extracted in the previous unformatted * function; see gcount(). - * @endif */ streamsize _M_gcount; diff --git a/libstdc++-v3/include/std/limits b/libstdc++-v3/include/std/limits index 621a6fc..cb4d1e2 100644 --- a/libstdc++-v3/include/std/limits +++ b/libstdc++-v3/include/std/limits @@ -1,6 +1,6 @@ // The template and inlines for the numeric_limits classes. -*- C++ -*- -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -205,9 +205,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** True if the type is signed. */ static const bool is_signed = false; /** True if the type is integer. - * @if maint * Is this supposed to be "if the type is integral"? - * @endif */ static const bool is_integer = false; /** True if the type uses an exact representation. "All integer types are @@ -278,10 +276,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * non-fundamental types, the functions will return 0 and the data * members will all be @c false. * - * @if maint * _GLIBCXX_RESOLVE_LIB_DEFECTS: DRs 201 and 184 (hi Gaby!) are * noted, but not incorporated in this documented (yet). - * @endif */ template<typename _Tp> struct numeric_limits : public __numeric_limits_base diff --git a/libstdc++-v3/include/std/sstream b/libstdc++-v3/include/std/sstream index 66159c8..f8dd50a 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 -// Free Software Foundation, Inc. +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, +// 2006, 2008 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 @@ -77,11 +77,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) typedef typename __string_type::size_type __size_type; protected: - /** - * @if maint - * Place to stash in || out || in | out settings for current stringbuf. - * @endif - */ + /// Place to stash in || out || in | out settings for current stringbuf. ios_base::openmode _M_mode; // Data Members: @@ -290,10 +286,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * Initializes @c sb using @c mode|in, and passes @c &sb to the base * class initializer. Does not allocate any buffer. * - * @if maint * That's a lie. We initialize the base class with NULL, because the * string class does its own memory management. - * @endif */ explicit basic_istringstream(ios_base::openmode __mode = ios_base::in) @@ -310,10 +304,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * Initializes @c sb using @a str and @c mode|in, and passes @c &sb * to the base class initializer. * - * @if maint * That's a lie. We initialize the base class with NULL, because the * string class does its own memory management. - * @endif */ explicit basic_istringstream(const __string_type& __str, @@ -403,10 +395,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * Initializes @c sb using @c mode|out, and passes @c &sb to the base * class initializer. Does not allocate any buffer. * - * @if maint * That's a lie. We initialize the base class with NULL, because the * string class does its own memory management. - * @endif */ explicit basic_ostringstream(ios_base::openmode __mode = ios_base::out) @@ -423,10 +413,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * Initializes @c sb using @a str and @c mode|out, and passes @c &sb * to the base class initializer. * - * @if maint * That's a lie. We initialize the base class with NULL, because the * string class does its own memory management. - * @endif */ explicit basic_ostringstream(const __string_type& __str, @@ -514,10 +502,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * Initializes @c sb using @c mode, and passes @c &sb to the base * class initializer. Does not allocate any buffer. * - * @if maint * That's a lie. We initialize the base class with NULL, because the * string class does its own memory management. - * @endif */ explicit basic_stringstream(ios_base::openmode __m = ios_base::out | ios_base::in) @@ -532,10 +518,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * Initializes @c sb using @a str and @c mode, and passes @c &sb * to the base class initializer. * - * @if maint * That's a lie. We initialize the base class with NULL, because the * string class does its own memory management. - * @endif */ explicit basic_stringstream(const __string_type& __str, diff --git a/libstdc++-v3/include/std/streambuf b/libstdc++-v3/include/std/streambuf index 72e3fe4..0c4d192 100644 --- a/libstdc++-v3/include/std/streambuf +++ b/libstdc++-v3/include/std/streambuf @@ -1,7 +1,7 @@ // Stream buffer classes -*- C++ -*- // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -// 2006, 2007 Free Software Foundation, Inc. +// 2006, 2007, 2008 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 @@ -50,11 +50,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std) - /** - * @if maint - * Does stuff. - * @endif - */ template<typename _CharT, typename _Traits> streamsize __copy_streambufs_eof(basic_streambuf<_CharT, _Traits>*, @@ -138,11 +133,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) //@} //@{ - /** - * @if maint - * This is a non-standard type. - * @endif - */ + /// This is a non-standard type. typedef basic_streambuf<char_type, traits_type> __streambuf_type; //@} @@ -184,13 +175,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std) protected: //@{ /** - * @if maint * This is based on _IO_FILE, just reordered to be more consistent, * and is intended to be the most minimal abstraction for an * internal buffer. * - get == input == read * - put == output == write - * @endif */ char_type* _M_in_beg; // Start of get area. char_type* _M_in_cur; // Current read area. @@ -199,11 +188,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) char_type* _M_out_cur; // Current put area. char_type* _M_out_end; // End of put area. - /** - * @if maint - * Current locale setting. - * @endif - */ + /// Current locale setting. locale _M_buf_locale; public: diff --git a/libstdc++-v3/include/std/tuple b/libstdc++-v3/include/std/tuple index 61302f1..d64c141 100644 --- a/libstdc++-v3/include/std/tuple +++ b/libstdc++-v3/include/std/tuple @@ -1,6 +1,6 @@ // <tuple> -*- C++ -*- -// Copyright (C) 2007 Free Software Foundation, Inc. +// Copyright (C) 2007, 2008 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 @@ -101,33 +101,27 @@ namespace std }; /** - * @if maint * Contains the actual implementation of the @c tuple template, stored * as a recursive inheritance hierarchy from the first element (most * derived class) to the last (least derived class). The @c Idx * parameter gives the 0-based index of the element stored at this * point in the hierarchy; we use it to implement a constant-time * get() operation. - * @endif */ template<int _Idx, typename... _Elements> struct _Tuple_impl; /** - * @if maint * Zero-element tuple implementation. This is the basis case for the * inheritance recursion. - * @endif maint */ template<int _Idx> struct _Tuple_impl<_Idx> { }; /** - * @if maint * Recursive tuple implementation. Here we store the @c Head element * and derive from a @c Tuple_impl containing the remaining elements * (which contains the @c Tail). - * @endif */ template<int _Idx, typename _Head, typename... _Tail> struct _Tuple_impl<_Idx, _Head, _Tail...> @@ -378,19 +372,15 @@ namespace std struct tuple_element; /** - * @if maint * Recursive case for tuple_element: strip off the first element in * the tuple and retrieve the (i-1)th element of the remaining tuple. - * @endif */ template<int __i, typename _Head, typename... _Tail> struct tuple_element<__i, tuple<_Head, _Tail...> > : tuple_element<__i - 1, tuple<_Tail...> > { }; /** - * @if maint * Basis case for tuple_element: The first element is the one we're seeking. - * @endif */ template<typename _Head, typename... _Tail> struct tuple_element<0, tuple<_Head, _Tail...> > |