Chromium Code Reviews| Index: third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak_bionic.h |
| diff --git a/third_party/tcmalloc/vendor/src/libc_override_gcc_and_weak.h b/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak_bionic.h |
| similarity index 95% |
| copy from third_party/tcmalloc/vendor/src/libc_override_gcc_and_weak.h |
| copy to third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak_bionic.h |
| index 070ebf72aac92304c195dc08b4c563f42589190e..4aa1dd91a88f8af0d83b7af0ca701632023d67b6 100644 |
| --- a/third_party/tcmalloc/vendor/src/libc_override_gcc_and_weak.h |
| +++ b/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak_bionic.h |
| @@ -53,11 +53,12 @@ |
| #define ALIAS(tc_fn) __attribute__ ((alias (#tc_fn))) |
| -void* operator new(size_t size) throw (std::bad_alloc) |
| +// Bionic throws an exception, but there's no std::bad_alloc. |
| +void* operator new(size_t size) throw (/* std::bad_alloc */) |
|
Dai Mikurube (NOT FULLTIME)
2013/05/08 14:53:25
How about simply using #ifdef instead of a new fil
bulach
2013/05/08 16:09:10
good idea! I originally thought we'd have more dif
|
| 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); |