diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-11-08 16:01:27 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-11-08 16:04:05 -0800 |
| commit | b873dc778f52461129b1e28fb12dd3d4a309851c (patch) | |
| tree | e82913bc549a83104ce8abfb518eca6cb6d8aa83 /system/include/libcxx/exception | |
| parent | 140ea9e81feb09d8f2559995c73d49a39424ef5d (diff) | |
| parent | e0268fa1035a718341c53921eee9318d4a8033cd (diff) | |
Merge branch 'incoming' into f32
Conflicts:
src/parseTools.js
src/preamble.js
Diffstat (limited to 'system/include/libcxx/exception')
| -rw-r--r-- | system/include/libcxx/exception | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/system/include/libcxx/exception b/system/include/libcxx/exception index 102b10d6..ddd75bd4 100644 --- a/system/include/libcxx/exception +++ b/system/include/libcxx/exception @@ -118,8 +118,8 @@ _LIBCPP_FUNC_VIS bool uncaught_exception() _NOEXCEPT; class _LIBCPP_TYPE_VIS exception_ptr; -exception_ptr current_exception() _NOEXCEPT; -_LIBCPP_NORETURN void rethrow_exception(exception_ptr); +_LIBCPP_FUNC_VIS exception_ptr current_exception() _NOEXCEPT; +_LIBCPP_NORETURN _LIBCPP_FUNC_VIS void rethrow_exception(exception_ptr); class _LIBCPP_TYPE_VIS exception_ptr { @@ -142,8 +142,8 @@ public: bool operator!=(const exception_ptr& __x, const exception_ptr& __y) _NOEXCEPT {return !(__x == __y);} - friend exception_ptr current_exception() _NOEXCEPT; - friend void rethrow_exception(exception_ptr); + friend _LIBCPP_FUNC_VIS exception_ptr current_exception() _NOEXCEPT; + friend _LIBCPP_FUNC_VIS void rethrow_exception(exception_ptr); }; template<class _Ep> |