aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3/include/std
diff options
context:
space:
mode:
Diffstat (limited to 'libstdc++-v3/include/std')
-rw-r--r--libstdc++-v3/include/std/istream2
-rw-r--r--libstdc++-v3/include/std/limits24
-rw-r--r--libstdc++-v3/include/std/streambuf27
-rw-r--r--libstdc++-v3/include/std/tuple12
-rw-r--r--libstdc++-v3/include/std/type_traits37
-rw-r--r--libstdc++-v3/include/std/typeindex13
6 files changed, 63 insertions, 52 deletions
diff --git a/libstdc++-v3/include/std/istream b/libstdc++-v3/include/std/istream
index ae1485f5f43..861bca53adf 100644
--- a/libstdc++-v3/include/std/istream
+++ b/libstdc++-v3/include/std/istream
@@ -660,7 +660,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
bool _M_ok;
public:
- /// Easy access to dependant types.
+ /// Easy access to dependent types.
typedef _Traits traits_type;
typedef basic_streambuf<_CharT, _Traits> __streambuf_type;
typedef basic_istream<_CharT, _Traits> __istream_type;
diff --git a/libstdc++-v3/include/std/limits b/libstdc++-v3/include/std/limits
index 13ad660aeca..a137d0b1210 100644
--- a/libstdc++-v3/include/std/limits
+++ b/libstdc++-v3/include/std/limits
@@ -211,14 +211,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/** True if the type is signed. */
static _GLIBCXX_USE_CONSTEXPR bool is_signed = false;
- /** True if the type is integer.
- * Is this supposed to be <em>if the type is integral?</em> */
+ /** True if the type is integer. */
static _GLIBCXX_USE_CONSTEXPR bool is_integer = false;
- /** True if the type uses an exact representation. <em>All integer types are
+ /** True if the type uses an exact representation. All integer types are
exact, but not all exact types are integer. For example, rational and
- fixed-exponent representations are exact but not integer.</em>
- [18.2.1.2]/15 */
+ fixed-exponent representations are exact but not integer. */
static _GLIBCXX_USE_CONSTEXPR bool is_exact = false;
/** For integer types, specifies the base of the representation. For
@@ -246,27 +244,27 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
static _GLIBCXX_USE_CONSTEXPR bool has_infinity = false;
/** True if the type has a representation for a quiet (non-signaling)
- <em>Not a Number</em>. */
+ Not a Number. */
static _GLIBCXX_USE_CONSTEXPR bool has_quiet_NaN = false;
/** True if the type has a representation for a signaling
- <em>Not a Number</em>. */
+ Not a Number. */
static _GLIBCXX_USE_CONSTEXPR bool has_signaling_NaN = false;
/** See std::float_denorm_style for more information. */
static _GLIBCXX_USE_CONSTEXPR float_denorm_style has_denorm = denorm_absent;
- /** <em>True if loss of accuracy is detected as a denormalization loss,
- rather than as an inexact result.</em> [18.2.1.2]/42 */
+ /** True if loss of accuracy is detected as a denormalization loss,
+ rather than as an inexact result. */
static _GLIBCXX_USE_CONSTEXPR bool has_denorm_loss = false;
/** True if-and-only-if the type adheres to the IEC 559 standard, also
known as IEEE 754. (Only makes sense for floating point types.) */
static _GLIBCXX_USE_CONSTEXPR bool is_iec559 = false;
- /** <em>True if the set of values representable by the type is
+ /** True if the set of values representable by the type is
finite. All built-in types are bounded, this member would be
- false for arbitrary precision types.</em> [18.2.1.2]/54 */
+ false for arbitrary precision types. */
static _GLIBCXX_USE_CONSTEXPR bool is_bounded = false;
/** True if the type is @e modulo. A type is modulo if, for any
@@ -334,12 +332,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
static _GLIBCXX_CONSTEXPR _Tp
infinity() _GLIBCXX_USE_NOEXCEPT { return _Tp(); }
- /** The representation of a quiet <em>Not a Number</em>,
+ /** The representation of a quiet Not a Number,
if @c has_quiet_NaN. */
static _GLIBCXX_CONSTEXPR _Tp
quiet_NaN() _GLIBCXX_USE_NOEXCEPT { return _Tp(); }
- /** The representation of a signaling <em>Not a Number</em>, if
+ /** The representation of a signaling Not a Number, if
@c has_signaling_NaN. */
static _GLIBCXX_CONSTEXPR _Tp
signaling_NaN() _GLIBCXX_USE_NOEXCEPT { return _Tp(); }
diff --git a/libstdc++-v3/include/std/streambuf b/libstdc++-v3/include/std/streambuf
index 0fb2f07cc90..26a3871471c 100644
--- a/libstdc++-v3/include/std/streambuf
+++ b/libstdc++-v3/include/std/streambuf
@@ -123,7 +123,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
//@{
/**
* These are standard types. They permit a standardized way of
- * referring to names of (or names dependant on) the template
+ * referring to names of (or names dependent on) the template
* parameters, which are specific to the implementation.
*/
typedef _CharT char_type;
@@ -145,7 +145,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
friend class ostreambuf_iterator<char_type, traits_type>;
friend streamsize
- __copy_streambufs_eof<>(__streambuf_type*, __streambuf_type*, bool&);
+ __copy_streambufs_eof<>(basic_streambuf*, basic_streambuf*, bool&);
template<bool _IsMove, typename _CharT2>
friend typename __gnu_cxx::__enable_if<__is_char<_CharT2>::__value,
@@ -174,20 +174,19 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
basic_string<_CharT2, _Traits2, _Alloc>&, _CharT2);
protected:
- //@{
- /**
+ /*
* 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
*/
- char_type* _M_in_beg; // Start of get area.
- char_type* _M_in_cur; // Current read area.
- char_type* _M_in_end; // End of get area.
- char_type* _M_out_beg; // Start of put area.
- char_type* _M_out_cur; // Current put area.
- char_type* _M_out_end; // End of put area.
+ char_type* _M_in_beg; ///< Start of get area.
+ char_type* _M_in_cur; ///< Current read area.
+ char_type* _M_in_end; ///< End of get area.
+ char_type* _M_out_beg; ///< Start of put area.
+ char_type* _M_out_cur; ///< Current put area.
+ char_type* _M_out_end; ///< End of put area.
/// Current locale setting.
locale _M_buf_locale;
@@ -236,7 +235,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
* derived @c foo member functions, passing the arguments (if any)
* and returning the result unchanged.
*/
- __streambuf_type*
+ basic_streambuf*
pubsetbuf(char_type* __s, streamsize __n)
{ return this->setbuf(__s, __n); }
@@ -800,15 +799,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
private:
// _GLIBCXX_RESOLVE_LIB_DEFECTS
// Side effect of DR 50.
- basic_streambuf(const __streambuf_type& __sb)
+ basic_streambuf(const basic_streambuf& __sb)
: _M_in_beg(__sb._M_in_beg), _M_in_cur(__sb._M_in_cur),
_M_in_end(__sb._M_in_end), _M_out_beg(__sb._M_out_beg),
_M_out_cur(__sb._M_out_cur), _M_out_end(__sb._M_out_cur),
_M_buf_locale(__sb._M_buf_locale)
{ }
- __streambuf_type&
- operator=(const __streambuf_type&) { return *this; };
+ basic_streambuf&
+ operator=(const basic_streambuf&) { return *this; };
};
// Explicit specialization declarations, defined in src/streambuf.cc.
diff --git a/libstdc++-v3/include/std/tuple b/libstdc++-v3/include/std/tuple
index 80b136a2c61..ee2b2e1d4c2 100644
--- a/libstdc++-v3/include/std/tuple
+++ b/libstdc++-v3/include/std/tuple
@@ -43,6 +43,11 @@ namespace std _GLIBCXX_VISIBILITY(default)
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION
+ /**
+ * @addtogroup utilities
+ * @{
+ */
+
// Adds a const reference to a non-reference type.
template<typename _Tp>
struct __add_c_ref
@@ -1018,6 +1023,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
};
+ /// tuple_cat
template<typename... _Tpls, typename = typename
enable_if<__and_<__is_tuple_like<_Tpls>...>::value>::type>
constexpr auto
@@ -1030,11 +1036,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return __concater::_S_do(std::forward<_Tpls>(__tpls)...);
}
+ /// tie
template<typename... _Elements>
inline tuple<_Elements&...>
tie(_Elements&... __args) noexcept
{ return tuple<_Elements&...>(__args...); }
+ /// swap
template<typename... _Elements>
inline void
swap(tuple<_Elements...>& __x, tuple<_Elements...>& __y)
@@ -1080,8 +1088,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
second(std::forward<_Args2>(std::get<_Indexes2>(__tuple2))...)
{ }
+ /// @}
+
_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
+} // namespace std
#endif // C++11
diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
index cfc45390454..62d59128f9f 100644
--- a/libstdc++-v3/include/std/type_traits
+++ b/libstdc++-v3/include/std/type_traits
@@ -1,4 +1,4 @@
-// C++11 type_traits -*- C++ -*-
+// C++11 <type_traits> -*- C++ -*-
// Copyright (C) 2007-2013 Free Software Foundation, Inc.
//
@@ -42,7 +42,7 @@ namespace std _GLIBCXX_VISIBILITY(default)
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
- * @defgroup metaprogramming Metaprogramming and type traits
+ * @defgroup metaprogramming Metaprogramming
* @ingroup utilities
*
* Template utilities for compile-time introspection and modification,
@@ -62,15 +62,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
constexpr operator value_type() { return value; }
};
+ template<typename _Tp, _Tp __v>
+ constexpr _Tp integral_constant<_Tp, __v>::value;
+
/// The type used as a compile-time boolean with true value.
typedef integral_constant<bool, true> true_type;
/// The type used as a compile-time boolean with false value.
typedef integral_constant<bool, false> false_type;
- template<typename _Tp, _Tp __v>
- constexpr _Tp integral_constant<_Tp, __v>::value;
-
// Meta programming helper types.
template<bool, typename, typename>
@@ -145,7 +145,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
struct __failure_type
{ };
- // primary type categories.
+ // Primary type categories.
template<typename>
struct remove_cv;
@@ -426,7 +426,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
remove_cv<_Tp>::type>::value)>
{ };
- // composite type categories.
+ // Composite type categories.
/// is_reference
template<typename _Tp>
@@ -484,7 +484,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
typename remove_cv<_Tp>::type>::value)>
{ };
- // type properties.
+ // Type properties.
/// is_const
template<typename>
@@ -577,7 +577,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ };
- // destructible and constructible type properties
+ // Destructible and constructible type properties.
template<typename>
struct add_rvalue_reference;
@@ -1271,7 +1271,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ };
- // type relations.
+ // Type relations.
/// is_same
template<typename, typename>
@@ -1320,7 +1320,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ };
- // const-volatile modifications.
+ // Const-volatile modifications.
/// remove_const
template<typename _Tp>
@@ -1420,7 +1420,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ };
- // sign modifications.
+ // Sign modifications.
// Utility for constructing identically cv-qualified types.
template<typename _Unqualified, bool _IsConst, bool _IsVol>
@@ -1617,7 +1617,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
struct make_signed<bool>;
- // array modifications.
+ // Array modifications.
/// remove_extent
template<typename _Tp>
@@ -1646,7 +1646,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ typedef typename remove_all_extents<_Tp>::type type; };
- // pointer modifications.
+ // Pointer modifications.
template<typename _Tp, typename>
struct __remove_pointer_helper
@@ -1789,7 +1789,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename... _Tp>
struct common_type;
- // sfinae-friendly common_type implementation:
+ // Sfinae-friendly common_type implementation:
struct __do_common_type_impl
{
@@ -1877,7 +1877,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Signature>
class result_of;
- // sfinae-friendly result_of implementation:
+ // Sfinae-friendly result_of implementation:
// [func.require] paragraph 1 bullet 1:
struct __result_of_memfun_ref_impl
@@ -2034,6 +2034,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_Functor, _ArgTypes...
>::type
{ };
+
+ /// @} group metaprogramming
/**
* Use SFINAE to determine if the type _Tp has a publicly-accessible
@@ -2064,9 +2066,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
<typename remove_cv<_Tp>::type>::value> \
{ };
- /// @} group metaprogramming
_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
+} // namespace std
#endif // C++11
diff --git a/libstdc++-v3/include/std/typeindex b/libstdc++-v3/include/std/typeindex
index 793894f3f80..9e6db30a72a 100644
--- a/libstdc++-v3/include/std/typeindex
+++ b/libstdc++-v3/include/std/typeindex
@@ -1,4 +1,4 @@
-// C++0x typeindex -*- C++ -*-
+// C++11 <typeindex> -*- C++ -*-
// Copyright (C) 2010-2013 Free Software Foundation, Inc.
//
@@ -42,9 +42,12 @@ namespace std _GLIBCXX_VISIBILITY(default)
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
- @brief The class type_index provides a simple wrapper for type_info
- which can be used as an index type in associative containers (23.6)
- and in unordered associative containers (23.7).
+ * @brief Class type_index
+ * @ingroup utilities
+ *
+ * The class type_index provides a simple wrapper for type_info
+ * which can be used as an index type in associative containers
+ * (23.6) and in unordered associative containers (23.7).
*/
struct type_index
{
@@ -102,7 +105,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
};
_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
+} // namespace std
#endif // C++11