From 8fdc872ae4626d76ff641bddffc657897d6aa8b9 Mon Sep 17 00:00:00 2001 From: dim Date: Wed, 7 Sep 2016 20:41:08 +0000 Subject: [PATCH] Revert r305496 for now, since jbeich@ found a good upstream fix for the Firefox port. --- contrib/libc++/include/exception | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/contrib/libc++/include/exception b/contrib/libc++/include/exception index 14eede2127b..186d379f08f 100644 --- a/contrib/libc++/include/exception +++ b/contrib/libc++/include/exception @@ -80,6 +80,10 @@ template void rethrow_if_nested(const E& e); #include <__config> #include #include +#if defined(_LIBCPP_NO_EXCEPTIONS) +#include +#include +#endif #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #pragma GCC system_header @@ -251,11 +255,6 @@ rethrow_if_nested(const _Ep&, typename enable_if< } // std -#if defined(_LIBCPP_NO_EXCEPTIONS) -#include -#include -#endif - _LIBCPP_BEGIN_NAMESPACE_STD template -- 2.45.0