diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2012-02-09 12:15:39 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2012-02-09 12:15:39 -0800 |
| commit | 5ad789bfb4566bc8444c199bfeff8a509328f740 (patch) | |
| tree | b8f9296db7ddfa1403d1289320d54a3fb140ba9a /system/lib/libcxx/exception.cpp | |
| parent | 7b088a2235cc89e9ca360e970199b26cf99736eb (diff) | |
| parent | 7e97c880b6281d53b1f75e34989ee61d434cad2a (diff) | |
Merge pull request #240 from ehsan/uncaught2
Always pick the JS implementation of uncaught_exception
Diffstat (limited to 'system/lib/libcxx/exception.cpp')
| -rw-r--r-- | system/lib/libcxx/exception.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/system/lib/libcxx/exception.cpp b/system/lib/libcxx/exception.cpp index 26d97a96..cba355e9 100644 --- a/system/lib/libcxx/exception.cpp +++ b/system/lib/libcxx/exception.cpp @@ -86,6 +86,7 @@ std::terminate() _NOEXCEPT } #endif // LIBCXXRT +#ifndef EMSCRIPTEN // This is implemented in Javascript for Emscripten bool std::uncaught_exception() _NOEXCEPT { #if __APPLE__ @@ -99,6 +100,7 @@ bool std::uncaught_exception() _NOEXCEPT ::abort(); #endif // __APPLE__ } +#endif // EMSCRIPTEN namespace std { |