disabled.
* testsuite/18_support/exception_ptr/64241.cc: New.
+ PR libstdc++/64276
+ * doc/doxygen/user.cfg.in: Define __cpp_exceptions and __cpp_rtti.
+ * doc/html/manual/using_exceptions.html: Regenerate.
+ * doc/xml/manual/using_exceptions.xml: Use SD-6 feature-testing
+ macros, __cpp_exceptions and __cpp_rtti, instead of __EXCEPTIONS and
+ __GXX_RTTI.
+ * include/bits/c++config: Likewise.
+ * include/bits/locale_classes.tcc: Likewise.
+ * include/bits/shared_ptr.h: Likewise.
+ * include/bits/shared_ptr_base.h: Likewise.
+ * include/debug/formatter.h: Likewise.
+ * include/experimental/any: Likewise.
+ * include/ext/rope: Likewise.
+ * include/ext/ropeimpl.h: Likewise.
+ * include/std/functional: Likewise.
+ * include/tr1/functional: Likewise.
+ * include/tr1/shared_ptr.h: Likewise.
+ * libsupc++/eh_call.cc: Likewise.
+ * libsupc++/eh_personality.cc: Likewise.
+ * libsupc++/exception_defines.h: Likewise.
+ * libsupc++/exception_ptr.h: Likewise.
+ * libsupc++/guard.cc: Likewise.
+ * libsupc++/pbase_type_info.cc: Likewise.
+ * libsupc++/pointer_type_info.cc: Likewise.
+ * libsupc++/vterminate.cc: Likewise.
+ * src/c++11/thread.cc: Likewise.
+
2014-12-12 Jonathan Wakely <jwakely@redhat.com>
* include/bits/stl_iterator.h (make_reverse_iterator): LWG DR 2285.
_GLIBCXX_USE_C99_STDINT_TR1 \
_GLIBCXX_USE_SCHED_YIELD \
_GLIBCXX_USE_NANOSLEEP \
- __EXCEPTIONS \
- __GXX_RTTI \
+ __cpp_exceptions \
+ __cpp_rtti \
ATOMIC_INT_LOCK_FREE \
PB_DS_DATA_TRUE_INDICATOR \
PB_DS_STATIC_ASSERT=// \
and <code class="literal">__throw_exception_again</code>. They are defined
as follows.
</p><pre class="programlisting">
-#ifdef __EXCEPTIONS
+#if __cpp_exceptions
# define __try try
# define __catch(X) catch(X)
# define __throw_exception_again throw
class <code class="classname">exception</code>, there exists a corresponding
function with C language linkage. An example:
</p><pre class="programlisting">
-#ifdef __EXCEPTIONS
+#if __cpp_exceptions
void __throw_bad_exception(void)
{ throw bad_exception(); }
#else
<a class="link" href="http://gcc.gnu.org/PR25191" target="_top">
GCC Bug 25191: exception_defines.h #defines try/catch
</a>
- </em>. </span></p></div></div></div><div class="navfooter"><hr /><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="using_concurrency.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="using.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="debug.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Concurrency </td><td width="20%" align="center"><a accesskey="h" href="../index.html">Home</a></td><td width="40%" align="right" valign="top"> Debugging Support</td></tr></table></div></body></html>
\ No newline at end of file
+ </em>. </span></p></div></div></div><div class="navfooter"><hr /><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="using_concurrency.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="using.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="debug.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Concurrency </td><td width="20%" align="center"><a accesskey="h" href="../index.html">Home</a></td><td width="40%" align="right" valign="top"> Debugging Support</td></tr></table></div></body></html>
</para>
<programlisting>
-#ifdef __EXCEPTIONS
+#if __cpp_exceptions
# define __try try
# define __catch(X) catch(X)
# define __throw_exception_again throw
</para>
<programlisting>
-#ifdef __EXCEPTIONS
+#if __cpp_exceptions
void __throw_bad_exception(void)
{ throw bad_exception(); }
#else
#endif
#ifndef _GLIBCXX_THROW_OR_ABORT
-# if __EXCEPTIONS
+# if __cpp_exceptions
# define _GLIBCXX_THROW_OR_ABORT(_EXC) (throw (_EXC))
# else
# define _GLIBCXX_THROW_OR_ABORT(_EXC) (__builtin_abort())
const size_t __i = _Facet::id._M_id();
const locale::facet** __facets = __loc._M_impl->_M_facets;
return (__i < __loc._M_impl->_M_facets_size
-#ifdef __GXX_RTTI
+#if __cpp_rtti
&& dynamic_cast<const _Facet*>(__facets[__i]));
#else
&& static_cast<const _Facet*>(__facets[__i]));
const locale::facet** __facets = __loc._M_impl->_M_facets;
if (__i >= __loc._M_impl->_M_facets_size || !__facets[__i])
__throw_bad_cast();
-#ifdef __GXX_RTTI
+#if __cpp_rtti
return dynamic_cast<const _Facet&>(*__facets[__i]);
#else
return static_cast<const _Facet&>(*__facets[__i]);
inline _Del*
get_deleter(const __shared_ptr<_Tp, _Lp>& __p) noexcept
{
-#ifdef __GXX_RTTI
+#if __cpp_rtti
return static_cast<_Del*>(__p._M_get_deleter(typeid(_Del)));
#else
return 0;
virtual void*
_M_get_deleter(const std::type_info& __ti) noexcept
{
-#ifdef __GXX_RTTI
+#if __cpp_rtti
// _GLIBCXX_RESOLVE_LIB_DEFECTS
// 2400. shared_ptr's get_deleter() should use addressof()
return __ti == typeid(_Deleter)
virtual void*
_M_get_deleter(const std::type_info& __ti) noexcept
{
-#ifdef __GXX_RTTI
+#if __cpp_rtti
if (__ti == typeid(_Sp_make_shared_tag))
return const_cast<typename remove_cv<_Tp>::type*>(_M_ptr());
#endif
owner_before(__weak_ptr<_Tp1, _Lp> const& __rhs) const
{ return _M_refcount._M_less(__rhs._M_refcount); }
-#ifdef __GXX_RTTI
+#if __cpp_rtti
protected:
// This constructor is non-standard, it is used by allocate_shared.
template<typename _Alloc, typename... _Args>
{
_M_variant._M_iterator._M_name = __name;
_M_variant._M_iterator._M_address = &__it;
-#ifdef __GXX_RTTI
+#if __cpp_rtti
_M_variant._M_iterator._M_type = &typeid(__it);
#else
_M_variant._M_iterator._M_type = 0;
typename _Sequence::iterator>::
__value ? __mutable_iterator : __const_iterator;
_M_variant._M_iterator._M_sequence = __it._M_get_sequence();
-#ifdef __GXX_RTTI
+#if __cpp_rtti
_M_variant._M_iterator._M_seq_type = &typeid(_Sequence);
#else
_M_variant._M_iterator._M_seq_type = 0;
{
_M_variant._M_iterator._M_name = __name;
_M_variant._M_iterator._M_address = &__it;
-#ifdef __GXX_RTTI
+#if __cpp_rtti
_M_variant._M_iterator._M_type = &typeid(__it);
#else
_M_variant._M_iterator._M_type = 0;
typename _Sequence::local_iterator>::
__value ? __mutable_iterator : __const_iterator;
_M_variant._M_iterator._M_sequence = __it._M_get_sequence();
-#ifdef __GXX_RTTI
+#if __cpp_rtti
_M_variant._M_iterator._M_seq_type = &typeid(_Sequence);
#else
_M_variant._M_iterator._M_seq_type = 0;
{
_M_variant._M_iterator._M_name = __name;
_M_variant._M_iterator._M_address = &__it;
-#ifdef __GXX_RTTI
+#if __cpp_rtti
_M_variant._M_iterator._M_type = &typeid(__it);
#else
_M_variant._M_iterator._M_type = 0;
{
_M_variant._M_iterator._M_name = __name;
_M_variant._M_iterator._M_address = &__it;
-#ifdef __GXX_RTTI
+#if __cpp_rtti
_M_variant._M_iterator._M_type = &typeid(__it);
#else
_M_variant._M_iterator._M_type = 0;
{
_M_variant._M_iterator._M_name = __name;
_M_variant._M_iterator._M_address = &__it;
-#ifdef __GXX_RTTI
+#if __cpp_rtti
_M_variant._M_iterator._M_type = &typeid(__it);
#else
_M_variant._M_iterator._M_type = 0;
_M_variant._M_sequence._M_name = __name;
_M_variant._M_sequence._M_address =
static_cast<const _Sequence*>(&__seq);
-#ifdef __GXX_RTTI
+#if __cpp_rtti
_M_variant._M_sequence._M_type = &typeid(_Sequence);
#else
_M_variant._M_sequence._M_type = 0;
{
_M_variant._M_sequence._M_name = __name;
_M_variant._M_sequence._M_address = &__seq;
-#ifdef __GXX_RTTI
+#if __cpp_rtti
_M_variant._M_sequence._M_type = &typeid(_Sequence);
#else
_M_variant._M_sequence._M_type = 0;
[[gnu::noreturn]] inline void __throw_bad_any_cast()
{
-#ifdef __EXCEPTIONS
+#if __cpp_exceptions
throw bad_any_cast{};
#else
__builtin_abort();
_Manager_internal<_Tp>,
_Manager_external<_Tp>>;
-#ifdef __GXX_RTTI
+#if __cpp_rtti
// When RTTI is disabled __any_caster assumes the manager is either
// _Manager_internal or _Manager_external, so this type must not be used.
template<typename _Tp, typename _Alloc>
template <typename _Allocator>
any(allocator_arg_t, const _Allocator&) noexcept : any() { }
-#ifdef __GXX_RTTI
+#if __cpp_rtti
/// Construct with a copy of @p __value as the contained object.
template <typename _Allocator, typename _ValueType,
typename _Tp = _Decay<_ValueType>,
/// Reports whether there is a contained object or not.
bool empty() const noexcept { return _M_manager == nullptr; }
-#ifdef __GXX_RTTI
+#if __cpp_rtti
/// The @c typeid of the contained object, or @c typeid(void) if empty.
const type_info& type() const noexcept
{
template<typename _Tp>
friend void* __any_caster(const any* __any)
{
-#ifdef __GXX_RTTI
+#if __cpp_rtti
if (__any->type() != typeid(_Tp))
return nullptr;
#else
}
};
-#ifdef __GXX_RTTI
+#if __cpp_rtti
// Manage external contained object using an allocator
template<typename _Tp, typename _Alloc>
struct _Manager_alloc
}
// @}
-#ifdef __GXX_RTTI
+#if __cpp_rtti
template<typename _Tp, typename _Alloc>
struct any::_Manager_alloc<_Tp, _Alloc>::_Data
{
__arg->_M_obj = const_cast<_Tp*>(__ptr);
break;
case _Op_get_type_info:
-#ifdef __GXX_RTTI
+#if __cpp_rtti
__arg->_M_typeinfo = &typeid(_Tp);
#endif
break;
__arg->_M_obj = const_cast<_Tp*>(__ptr);
break;
case _Op_get_type_info:
-#ifdef __GXX_RTTI
+#if __cpp_rtti
__arg->_M_typeinfo = &typeid(_Tp);
#endif
break;
}
}
-#ifdef __GXX_RTTI
+#if __cpp_rtti
template<typename _Tp, typename _Alloc>
void
any::_Manager_alloc<_Tp, _Alloc>::
~_Rope_self_destruct_ptr()
{ _Rope_RopeRep<_CharT, _Alloc>::_S_unref(_M_ptr); }
-#ifdef __EXCEPTIONS
+#if __cpp_exceptions
_Rope_self_destruct_ptr() : _M_ptr(0) { };
#else
_Rope_self_destruct_ptr() { };
#endif
__result = _S_concat(__forest[__i], __result);
__forest[__i]->_M_unref_nonnil();
-#if !defined(__GC) && defined(__EXCEPTIONS)
+#if !defined(__GC) && __cpp_exceptions
__forest[__i] = 0;
#endif
}
{
switch (__op)
{
-#ifdef __GXX_RTTI
+#if __cpp_rtti
case __get_type_info:
__dest._M_access<const type_info*>() = &typeid(_Functor);
break;
{
switch (__op)
{
-#ifdef __GXX_RTTI
+#if __cpp_rtti
case __get_type_info:
__dest._M_access<const type_info*>() = &typeid(_Functor);
break;
{
switch (__op)
{
-#ifdef __GXX_RTTI
+#if __cpp_rtti
case __get_type_info:
__dest._M_access<const type_info*>() = &typeid(_Functor);
break;
*/
_Res operator()(_ArgTypes... __args) const;
-#ifdef __GXX_RTTI
+#if __cpp_rtti
// [3.7.2.5] function target access
/**
* @brief Determine the type of the target of this function object
return _M_invoker(_M_functor, std::forward<_ArgTypes>(__args)...);
}
-#ifdef __GXX_RTTI
+#if __cpp_rtti
template<typename _Res, typename... _ArgTypes>
const type_info&
function<_Res(_ArgTypes...)>::
{
switch (__op)
{
-#ifdef __GXX_RTTI
+#if __cpp_rtti
case __get_type_info:
__dest._M_access<const type_info*>() = &typeid(_Functor);
break;
{
switch (__op)
{
-#ifdef __GXX_RTTI
+#if __cpp_rtti
case __get_type_info:
__dest._M_access<const type_info*>() = &typeid(_Functor);
break;
{
switch (__op)
{
-#ifdef __GXX_RTTI
+#if __cpp_rtti
case __get_type_info:
__dest._M_access<const type_info*>() = &typeid(_Functor);
break;
*/
_Res operator()(_ArgTypes... __args) const;
-#ifdef __GXX_RTTI
+#if __cpp_rtti
// [3.7.2.5] function target access
/**
* @brief Determine the type of the target of this function object
return _M_invoker(_M_functor, __args...);
}
-#ifdef __GXX_RTTI
+#if __cpp_rtti
template<typename _Res, typename... _ArgTypes>
const type_info&
function<_Res(_ArgTypes...)>::
virtual void*
_M_get_deleter(const std::type_info& __ti)
{
-#ifdef __GXX_RTTI
+#if __cpp_rtti
return __ti == typeid(_Deleter) ? &_M_del : 0;
#else
return 0;
inline _Del*
get_deleter(const __shared_ptr<_Tp, _Lp>& __p)
{
-#ifdef __GXX_RTTI
+#if __cpp_rtti
return static_cast<_Del*>(__p._M_get_deleter(typeid(_Del)));
#else
return 0;
}
// If the exception spec allows std::bad_exception, throw that.
-#ifdef __EXCEPTIONS
+#if __cpp_exceptions
if (bad_exception_allowed)
throw std::bad_exception();
#endif
else if (!foreign_exception)
thrown_ptr = __get_object_from_ue (ue_header);
#else
-#ifdef __GXX_RTTI
+#if __cpp_rtti
// During forced unwinding, match a magic exception type.
if (actions & _UA_FORCE_UNWIND)
{
// If the exception spec allows std::bad_exception, throw that.
// We don't have a thrown object to compare against, but since
// bad_exception doesn't have virtual bases, that's OK; just pass 0.
-#if defined(__EXCEPTIONS) && defined(__GXX_RTTI)
+#if __cpp_exceptions && __cpp_rtti
const std::type_info &bad_exc = typeid (std::bad_exception);
if (check_exception_spec (&info, &bad_exc, 0, xh_switch_value))
throw std::bad_exception();
#ifndef _EXCEPTION_DEFINES_H
#define _EXCEPTION_DEFINES_H 1
-#ifndef __EXCEPTIONS
+#if ! __cpp_exceptions
// Iff -fno-exceptions, transform error handling code to work without it.
# define __try if (true)
# define __catch(X) if (false)
exception_ptr
make_exception_ptr(_Ex __ex) _GLIBCXX_USE_NOEXCEPT
{
-#ifdef __EXCEPTIONS
+#if __cpp_exceptions
try
{
throw __ex;
static inline void
throw_recursive_init_exception()
{
-#ifdef __EXCEPTIONS
+#if __cpp_exceptions
throw __gnu_cxx::recursive_init_error();
#else
// Use __builtin_trap so we don't require abort().
if (*this == *thr_type)
return true; // same type
-#ifdef __GXX_RTTI
+#if __cpp_rtti
if (typeid (*this) != typeid (*thr_type))
return false; // not both same kind of pointers
#endif
void **thr_obj,
unsigned outer) const
{
-#ifdef __GXX_RTTI
+#if __cpp_rtti
if (outer < 2 && *__pointee == typeid (void))
{
// conversion to void
// If the exception is derived from std::exception, we can
// give more information.
__try { __throw_exception_again; }
-#ifdef __EXCEPTIONS
+#if __cpp_exceptions
__catch(const exception& exc)
{
char const *w = exc.what();
thread::_M_start_thread(__shared_base_type __b)
{
if (!__gthread_active_p())
-#if __EXCEPTIONS
+#if __cpp_exceptions
throw system_error(make_error_code(errc::operation_not_permitted),
"Enable multithreading to use std::thread");
#else
projects / gcc.git / commitdiff