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 /libstdc++ | |
| parent | a4a8c4feb8cf3cebf8aceace70e699e128095b5c (diff) | |
| download | bionic-ae558d6b4bcee740f7e61434982eb5f2c999fb97.zip bionic-ae558d6b4bcee740f7e61434982eb5f2c999fb97.tar.gz bionic-ae558d6b4bcee740f7e61434982eb5f2c999fb97.tar.bz2 | |
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 'libstdc++')
| -rw-r--r-- | libstdc++/include/new | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libstdc++/include/new b/libstdc++/include/new index 0253e8b..c5a43de 100644 --- a/libstdc++/include/new +++ b/libstdc++/include/new @@ -13,19 +13,19 @@ namespace std { void* operator new(std::size_t); void* operator new[](std::size_t); -void operator delete(void*); -void operator delete[](void*); +void operator delete(void*) throw(); +void operator delete[](void*) throw(); void* operator new(std::size_t, const std::nothrow_t&); void* operator new[](std::size_t, const std::nothrow_t&); -void operator delete(void*, const std::nothrow_t&); -void operator delete[](void*, const std::nothrow_t&); +void operator delete(void*, const std::nothrow_t&) throw(); +void operator delete[](void*, const std::nothrow_t&) throw(); inline void* operator new(std::size_t, void* p) { return p; } inline void* operator new[](std::size_t, void* p) { return p; } // these next two are not really required, since exceptions are off -inline void operator delete(void*, void*) { } -inline void operator delete[](void*, void*) { } +inline void operator delete(void*, void*) throw() { } +inline void operator delete[](void*, void*) throw() { } } // extern C++ |