generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Add standard throw() spec to delete operators."

Browse Source
This commit is contained in:
Chih-Hung Hsieh
2014-08-25 22:08:32 +00:00
committed by Gerrit Code Review
parent a4a8c4feb8 ae558d6b4b
commit 9e307af982
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libc/bionic/new.cpp
View File

@@ -38,11 +38,11 @@ void* operator new[](std::size_t size) {
return p; return p;
} }
void operator delete(void* ptr) { void operator delete(void* ptr) throw() {
free(ptr); free(ptr);
} }
void operator delete[](void* ptr) { void operator delete[](void* ptr) throw() {
free(ptr); free(ptr);
} }
@@ -54,10 +54,10 @@ void* operator new[](std::size_t size, const std::nothrow_t&) {
return malloc(size); return malloc(size);
} }
void operator delete(void* ptr, const std::nothrow_t&) { void operator delete(void* ptr, const std::nothrow_t&) throw() {
free(ptr); free(ptr);
} }
void operator delete[](void* ptr, const std::nothrow_t&) { void operator delete[](void* ptr, const std::nothrow_t&) throw() {
free(ptr); free(ptr);
} }

12
libstdc++/include/new
View File

@@ -13,19 +13,19 @@ namespace std {
void* operator new(std::size_t); void* operator new(std::size_t);
void* operator new[](std::size_t); void* operator new[](std::size_t);
void operator delete(void*); void operator delete(void*) throw();
void operator delete[](void*); 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 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&) throw();
void operator delete[](void*, const std::nothrow_t&); 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; }
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 // these next two are not really required, since exceptions are off
inline void operator delete(void*, void*) { } inline void operator delete(void*, void*) throw() { }
inline void operator delete[](void*, void*) { } inline void operator delete[](void*, void*) throw() { }
} // extern C++ } // extern C++