Chromium Code Reviews| Index: third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h |
| diff --git a/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h b/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h |
| index 070ebf72aac92304c195dc08b4c563f42589190e..270ad9276b1ecd993fff0fad5cdea37edfe90805 100644 |
| --- a/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h |
| +++ b/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h |
| @@ -53,11 +53,18 @@ |
| #define ALIAS(tc_fn) __attribute__ ((alias (#tc_fn))) |
| -void* operator new(size_t size) throw (std::bad_alloc) |
| +#if defined(__ANDROID__) |
| +// Android's bionic doesn't have std::bad_alloc |
|
Dai Mikurube (NOT FULLTIME)
2013/05/09 16:29:29
nit: a period at last.
bulach
2013/05/09 17:33:58
Done.
|
| +#define STD_BAD_ALLOC |
| +#else |
| +#define STD_BAD_ALLOC std::bad_alloc |
| +#endif |
| + |
| +void* operator new(size_t size) throw (STD_BAD_ALLOC) |
| ALIAS(tc_new); |
| void operator delete(void* p) __THROW |
| ALIAS(tc_delete); |
| -void* operator new[](size_t size) throw (std::bad_alloc) |
| +void* operator new[](size_t size) throw (STD_BAD_ALLOC) |
| ALIAS(tc_newarray); |
| void operator delete[](void* p) __THROW |
| ALIAS(tc_deletearray); |