diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2016-09-07 20:41:08 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2016-09-07 20:41:08 +0000 |
| commit | 067a6c9ebb2baa7818517e55a6cf634dc63f293a (patch) | |
| tree | c0c7e37632797649f3f3a5a3389efbdad8b79cb1 /contrib/libc++ | |
| parent | 1f645baf5586fccacf4ae10af2c0b7d933e47745 (diff) | |
| download | src-067a6c9ebb2baa7818517e55a6cf634dc63f293a.tar.gz src-067a6c9ebb2baa7818517e55a6cf634dc63f293a.zip | |
Revert r305496 for now, since jbeich@ found a good upstream fix for the
Firefox port.
Notes
Notes:
svn path=/projects/clang390-import/; revision=305565
Diffstat (limited to 'contrib/libc++')
| -rw-r--r-- | contrib/libc++/include/exception | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/contrib/libc++/include/exception b/contrib/libc++/include/exception index 14eede2127bd..186d379f08f5 100644 --- a/contrib/libc++/include/exception +++ b/contrib/libc++/include/exception @@ -80,6 +80,10 @@ template <class E> void rethrow_if_nested(const E& e); #include <__config> #include <cstddef> #include <type_traits> +#if defined(_LIBCPP_NO_EXCEPTIONS) +#include <cstdio> +#include <cstdlib> +#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 <cstdio> -#include <cstdlib> -#endif - _LIBCPP_BEGIN_NAMESPACE_STD template <class _Exception> |