Commit c0ffa2ba by Benjamin Kosnik Committed by Benjamin Kosnik

user.cfg.in: Set __cplusplus to 201103L.

2013-02-19  Benjamin Kosnik  <bkoz@redhat.com>

	* doc/doxygen/user.cfg.in: Set __cplusplus to 201103L. Change to
	_GLIBCXX_INCLUDE_AS_CXX11. DIRECTORY_GRAPH, MARKDOWN_SUPPORT,
	AUTOLINK_SUPPORT to NO. Update to doxygen 1.8.3.1.
	* include/bits/stl_pair.h: Add to utilities group.
	* include/std/tuple: Same.
	* include/std/typeindex: Same.

	* include/bits/stringfwd.h: Fix markup.
	* include/std/limits: Same.
	* include/std/type_traits: Same.
	* include/tr1/memory: Same.
	* include/tr1/regex: Same.
	* scripts/run_doxygen: Comment.
	* testsuite/20_util/uses_allocator/cons_neg.cc: Fixup line numbers.

From-SVN: r196162
parent 10b707dc
2013-02-19 Benjamin Kosnik <bkoz@redhat.com>
* doc/doxygen/user.cfg.in: Set __cplusplus to 201103L. Change to
_GLIBCXX_INCLUDE_AS_CXX11. DIRECTORY_GRAPH, MARKDOWN_SUPPORT,
AUTOLINK_SUPPORT to NO. Update to doxygen 1.8.3.1.
* include/bits/stl_pair.h: Add to utilities group.
* include/std/tuple: Same.
* include/std/typeindex: Same.
* include/bits/stringfwd.h: Fix markup.
* include/std/limits: Same.
* include/std/type_traits: Same.
* include/tr1/memory: Same.
* include/tr1/regex: Same.
* scripts/run_doxygen: Comment.
* testsuite/20_util/uses_allocator/cons_neg.cc: Fixup line numbers.
2013-02-14 Jason Merrill <jason@redhat.com>
* testsuite/18_support/quick_exit/quick_exit.cc: #if out the whole
......
......@@ -66,6 +66,11 @@ namespace std _GLIBCXX_VISIBILITY(default)
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @addtogroup utilities
* @{
*/
#if __cplusplus >= 201103L
/// piecewise_construct_t
struct piecewise_construct_t { };
......@@ -282,7 +287,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ return pair<_T1, _T2>(__x, __y); }
#endif
/// @}
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace
} // namespace std
#endif /* _STL_PAIR_H */
......@@ -60,12 +60,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<> struct char_traits<char>;
typedef basic_string<char> string; /// A string of @c char
/// A string of @c char
typedef basic_string<char> string;
#ifdef _GLIBCXX_USE_WCHAR_T
template<> struct char_traits<wchar_t>;
typedef basic_string<wchar_t> wstring; /// A string of @c wchar_t
/// A string of @c wchar_t
typedef basic_string<wchar_t> wstring;
#endif
#if ((__cplusplus >= 201103L) \
......@@ -74,13 +76,16 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<> struct char_traits<char16_t>;
template<> struct char_traits<char32_t>;
typedef basic_string<char16_t> u16string; /// A string of @c char16_t
typedef basic_string<char32_t> u32string; /// A string of @c char32_t
/// A string of @c char16_t
typedef basic_string<char16_t> u16string;
/// A string of @c char32_t
typedef basic_string<char32_t> u32string;
#endif
/** @} */
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace
} // namespace std
#endif // _STRINGFWD_H
......@@ -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(); }
......
......@@ -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
......
// 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
......
// 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
......
......@@ -32,8 +32,8 @@
#pragma GCC system_header
#if defined(_GLIBCXX_INCLUDE_AS_CXX0X)
# error TR1 header cannot be included from C++0x header
#if defined(_GLIBCXX_INCLUDE_AS_CXX11)
# error TR1 header cannot be included from C++11 header
#endif
#include <memory>
......
......@@ -847,7 +847,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
: _M_flags(__f), _M_pattern(__first, __last), _M_mark_count(0)
{ _M_compile(); }
#ifdef _GLIBCXX_INCLUDE_AS_CXX0X
#ifdef _GLIBCXX_INCLUDE_AS_CXX11
/**
* @brief Constructs a basic regular expression from an initializer list.
*
......@@ -986,7 +986,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
flag_type __flags = regex_constants::ECMAScript)
{ return this->assign(string_type(__first, __last), __flags); }
#ifdef _GLIBCXX_INCLUDE_AS_CXX0X
#ifdef _GLIBCXX_INCLUDE_AS_CXX11
/**
* @brief Assigns a new regular expression to a regex object.
*
......@@ -1966,7 +1966,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
begin() const
{ return _Base_type::begin(); }
#ifdef _GLIBCXX_INCLUDE_AS_CXX0X
#ifdef _GLIBCXX_INCLUDE_AS_CXX11
/**
* @brief Gets an iterator to the start of the %sub_match collection.
*/
......@@ -1982,7 +1982,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
end() const
{ return _Base_type::end(); }
#ifdef _GLIBCXX_INCLUDE_AS_CXX0X
#ifdef _GLIBCXX_INCLUDE_AS_CXX11
/**
* @brief Gets an iterator to one-past-the-end of the collection.
*/
......
......@@ -205,6 +205,8 @@ if $do_html; then
cd ${outdir}/${mode}
#doxytag -t libstdc++.tag . > /dev/null 2>&1
# Strip pathnames from tag file.
sed -e '/<path>/d' libstdc++.tag > TEMP
mv TEMP libstdc++.tag
......
......@@ -44,4 +44,4 @@ void test01()
tuple<Type> t(allocator_arg, a, 1);
}
// { dg-error "no matching function" "" { target *-*-* } 113 }
// { dg-error "no matching function" "" { target *-*-* } 118 }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment