|
16 | 16 | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
17 | 17 | */
|
18 | 18 |
|
19 |
| -#include <stdlib.h> |
| 19 | +#include "new.h" |
20 | 20 |
|
21 |
| -void *operator new(size_t size) { |
| 21 | +void * operator new(size_t size) { |
22 | 22 | return malloc(size);
|
23 | 23 | }
|
| 24 | +void * operator new[](size_t size) { |
| 25 | + return operator new(size); |
| 26 | +} |
24 | 27 |
|
25 |
| -void *operator new[](size_t size) { |
26 |
| - return malloc(size); |
| 28 | +void * operator new(size_t size, const std::nothrow_t tag) noexcept { |
| 29 | + return operator new(size); |
| 30 | +} |
| 31 | +void * operator new[](size_t size, const std::nothrow_t& tag) noexcept { |
| 32 | + return operator new[](size); |
27 | 33 | }
|
28 | 34 |
|
29 |
| -void * operator new(size_t size, void * ptr) noexcept { |
30 |
| - (void)size; |
31 |
| - return ptr; |
| 35 | +void * operator new(size_t size, void *place) noexcept { |
| 36 | + // Nothing to do |
| 37 | + (void)size; // unused |
| 38 | + return place; |
| 39 | +} |
| 40 | +void * operator new[](size_t size, void *place) noexcept { |
| 41 | + return operator new(size, place); |
32 | 42 | }
|
33 | 43 |
|
34 |
| -void operator delete(void * ptr) { |
| 44 | +void operator delete(void * ptr) noexcept { |
35 | 45 | free(ptr);
|
36 | 46 | }
|
| 47 | +void operator delete[](void * ptr) noexcept { |
| 48 | + operator delete(ptr); |
| 49 | +} |
37 | 50 |
|
38 |
| -void operator delete[](void * ptr) { |
39 |
| - free(ptr); |
| 51 | +#if __cplusplus >= 201402L |
| 52 | +void operator delete(void* ptr, size_t size) noexcept { |
| 53 | + operator delete(ptr); |
| 54 | +} |
| 55 | +void operator delete[](void * ptr, size_t size) noexcept { |
| 56 | + operator delete[](ptr); |
| 57 | +} |
| 58 | +#endif // __cplusplus >= 201402L |
| 59 | + |
| 60 | +void operator delete(void* ptr, const std::nothrow_t& tag) noexcept { |
| 61 | + operator delete(ptr); |
| 62 | +} |
| 63 | +void operator delete[](void* ptr, const std::nothrow_t& tag) noexcept { |
| 64 | + operator delete[](ptr); |
40 | 65 | }
|
41 | 66 |
|
| 67 | +void operator delete(void* ptr, void* place) noexcept { |
| 68 | + (void)ptr; (void)place; // unused |
| 69 | + // Nothing to do |
| 70 | +} |
| 71 | +void operator delete[](void* ptr, void* place) noexcept { |
| 72 | + (void)ptr; (void)place; // unused |
| 73 | + // Nothing to do |
| 74 | +} |
0 commit comments