diff options
author | Chih-Hung Hsieh <chh@google.com> | 2014-08-25 12:08:19 -0700 |
---|---|---|
committer | Chih-hung Hsieh <chh@google.com> | 2014-08-25 21:16:14 +0000 |
commit | ae558d6b4bcee740f7e61434982eb5f2c999fb97 (patch) | |
tree | 443b26ce7513f9ee430e4f639c5436fd11dbc9a5 /libc/bionic/new.cpp | |
parent | a4a8c4feb8cf3cebf8aceace70e699e128095b5c (diff) | |
download | android_bionic-ae558d6b4bcee740f7e61434982eb5f2c999fb97.tar.gz android_bionic-ae558d6b4bcee740f7e61434982eb5f2c999fb97.tar.bz2 android_bionic-ae558d6b4bcee740f7e61434982eb5f2c999fb97.zip |
Add standard throw() spec to delete operators.
Without these specs, clang will reports mismatch between standard definitions and these declarations/definitions. These specs are ignored when compiled with -fno-exceptions.
BUG: 17136236
Change-Id: I386c712a61dc4fc74dfde45f9ec2d3d037f2e9f1
Diffstat (limited to 'libc/bionic/new.cpp')
-rw-r--r-- | libc/bionic/new.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libc/bionic/new.cpp b/libc/bionic/new.cpp index fcfd1bdf5..cd84c2e30 100644 --- a/libc/bionic/new.cpp +++ b/libc/bionic/new.cpp @@ -38,11 +38,11 @@ void* operator new[](std::size_t size) { return p; } -void operator delete(void* ptr) { +void operator delete(void* ptr) throw() { free(ptr); } -void operator delete[](void* ptr) { +void operator delete[](void* ptr) throw() { free(ptr); } @@ -54,10 +54,10 @@ void* operator new[](std::size_t size, const std::nothrow_t&) { return malloc(size); } -void operator delete(void* ptr, const std::nothrow_t&) { +void operator delete(void* ptr, const std::nothrow_t&) throw() { free(ptr); } -void operator delete[](void* ptr, const std::nothrow_t&) { +void operator delete[](void* ptr, const std::nothrow_t&) throw() { free(ptr); } |