diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2014-01-13 16:55:19 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2014-01-13 16:56:03 -0800 |
| commit | cd1edebb5034ea52396a5b68304e84ae80878740 (patch) | |
| tree | 6a6f8364ea74985d11c4f6ff74e5b80e08dc849d /system/include/libcxx/new | |
| parent | af59788f8b7b76515e36bee1bf66edf497b801db (diff) | |
| parent | 2914deb17f3857bb02eeec87a58a3ed6d4a8853a (diff) | |
Merge branch 'incoming' of github.com:kripken/emscripten into incoming1.8.8
conflicts: tests/test_core.py tools/shared.py
Diffstat (limited to 'system/include/libcxx/new')
| -rw-r--r-- | system/include/libcxx/new | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/system/include/libcxx/new b/system/include/libcxx/new index 31bb5982..ea4a4a01 100644 --- a/system/include/libcxx/new +++ b/system/include/libcxx/new @@ -94,6 +94,7 @@ public: }; #if defined(_LIBCPP_BUILDING_NEW) || (_LIBCPP_STD_VER > 11) + class _LIBCPP_EXCEPTION_ABI bad_array_length : public bad_alloc { @@ -102,7 +103,10 @@ public: virtual ~bad_array_length() _NOEXCEPT; virtual const char* what() const _NOEXCEPT; }; -#endif + +#define _LIBCPP_BAD_ARRAY_LENGTH_DEFINED + +#endif // defined(_LIBCPP_BUILDING_NEW) || (_LIBCPP_STD_VER > 11) _LIBCPP_FUNC_VIS void __throw_bad_alloc(); // not in C++ spec |