diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2012-11-07 13:20:33 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2012-11-07 13:20:33 +0000 |
| commit | 54ba39f599fc2f3d59fd3cd828a301ce9b731a20 (patch) | |
| tree | 5e8df8f8120799af6eda74296cbb619955ece69b /libstdc++-v3/include/debug | |
| parent | c501a38e3ac91a43e3fcd70b7b5dff116805389e (diff) | |
| download | gcc-54ba39f599fc2f3d59fd3cd828a301ce9b731a20.tar.gz | |
array (_GLIBCXX_THROW_OR_ABORT): Move...
2012-11-07 Paolo Carlini <paolo.carlini@oracle.com>
* include/debug/array (_GLIBCXX_THROW_OR_ABORT): Move...
* include/bits/c++config: ... here.
* include/bits/shared_ptr_base.h (__throw_bad_weak_ptr): Use it.
* include/ext/pb_ds/exception.hpp: Likewise.
* include/ext/throw_allocator.h (__throw_forced_error): Likewise.
* include/ext/concurrence.h (__throw_concurrence_lock_error,
__throw_concurrence_unlock_error, __throw_concurrence_broadcast_error,
__throw_concurrence_wait_error): Likewise.
* include/tr1/shared_ptr.h (__throw_bad_weak_ptr): Likewise.
* include/tr1/functional (function<_Res(_ArgTypes...)>::operator()
(_ArgTypes...)): Likewise.
* libsupc++/eh_aux_runtime.cc (__cxxabiv1::__cxa_bad_cast,
__cxxabiv1::__cxa_bad_typeid): Likewise.
* libsupc++/vec.cc (compute_size): Likewise.
* libsupc++/new_op.cc (operator new (std::size_t)): Likewise.
* src/c++11/functexcept.cc: Likewise.
* testsuite/util/io/illegal_input_error.hpp
(__throw_illegal_input_error): Likewise.
* libsupc++/eh_personality.cc: Avoid warning with -fno-exceptions.
* testsuite/ext/profile/mutex_extensions_neg.cc: Adjust dg-error line
numbers.
* testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc:
Likewise.
* testsuite/23_containers/array/tuple_interface/
tuple_element_debug_neg.cc: Likewise.
* testsuite/23_containers/array/tuple_interface/get_debug_neg.cc:
Likewise.
* testsuite/20_util/shared_ptr/cons/43820_neg.cc: Likewise.
From-SVN: r193295
Diffstat (limited to 'libstdc++-v3/include/debug')
| -rw-r--r-- | libstdc++-v3/include/debug/array | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/libstdc++-v3/include/debug/array b/libstdc++-v3/include/debug/array index 1cde4e216d0..21b596b8f19 100644 --- a/libstdc++-v3/include/debug/array +++ b/libstdc++-v3/include/debug/array @@ -33,14 +33,6 @@ #include <debug/safe_sequence.h> -#ifndef _GLIBCXX_THROW_OR_ABORT -# if __EXCEPTIONS -# define _GLIBCXX_THROW_OR_ABORT(_Exc) (throw (_Exc)) -# else -# define _GLIBCXX_THROW_OR_ABORT(_Exc) (__builtin_abort()) -# endif -#endif - namespace std _GLIBCXX_VISIBILITY(default) { namespace __debug @@ -165,7 +157,7 @@ namespace __debug operator[](size_type __n) const noexcept { return __n < _Nm ? _AT_Type::_S_ref(_M_elems, __n) - : (_GLIBCXX_THROW_OR_ABORT (_Array_check_subscript<_Nm>(__n)), + : (_GLIBCXX_THROW_OR_ABORT(_Array_check_subscript<_Nm>(__n)), _AT_Type::_S_ref(_M_elems, 0)); } @@ -198,7 +190,7 @@ namespace __debug front() const { return _Nm ? _AT_Type::_S_ref(_M_elems, 0) - : (_GLIBCXX_THROW_OR_ABORT (_Array_check_nonempty<_Nm>()), + : (_GLIBCXX_THROW_OR_ABORT(_Array_check_nonempty<_Nm>()), _AT_Type::_S_ref(_M_elems, 0)); } @@ -213,7 +205,7 @@ namespace __debug back() const { return _Nm ? _AT_Type::_S_ref(_M_elems, _Nm - 1) - : (_GLIBCXX_THROW_OR_ABORT (_Array_check_nonempty<_Nm>()), + : (_GLIBCXX_THROW_OR_ABORT(_Array_check_nonempty<_Nm>()), _AT_Type::_S_ref(_M_elems, 0)); } @@ -316,6 +308,4 @@ namespace __debug }; } // namespace std -#undef _GLIBCXX_THROW_OR_ABORT - #endif // _GLIBCXX_DEBUG_ARRAY |