1 From 8baffbc46d740e997c5c7b2958091d74beb7fa99 Mon Sep 17 00:00:00 2001 2 From: Logan Chien <logan.chien (a] mediatek.com> 3 Date: Wed, 12 Feb 2014 20:09:43 +0800 4 Subject: [PATCH 04/12] std::terminate() should not specify "throw ()" in C++ 5 98. 6 7 --- 8 include/exception | 4 ++++ 9 1 file changed, 4 insertions(+) 10 11 diff --git a/include/exception b/include/exception 12 index cad802e..681a659 100644 13 --- a/include/exception 14 +++ b/include/exception 15 @@ -112,7 +112,11 @@ _LIBCPP_NORETURN _LIBCPP_FUNC_VIS void unexpected(); 16 typedef void (*terminate_handler)(); 17 _LIBCPP_FUNC_VIS terminate_handler set_terminate(terminate_handler) _NOEXCEPT; 18 _LIBCPP_FUNC_VIS terminate_handler get_terminate() _NOEXCEPT; 19 +#if __cplusplus >= 201103L 20 _LIBCPP_NORETURN _LIBCPP_FUNC_VIS void terminate() _NOEXCEPT; 21 +#else 22 +_LIBCPP_NORETURN _LIBCPP_FUNC_VIS void terminate(); 23 +#endif 24 25 _LIBCPP_FUNC_VIS bool uncaught_exception() _NOEXCEPT; 26 27 -- 28 1.9.1.423.g4596e3a 29 30
