diff options
| author | Larisse Voufo <lvoufo@google.com> | 2015-02-20 06:13:05 +0000 |
|---|---|---|
| committer | Larisse Voufo <lvoufo@google.com> | 2015-02-20 06:13:05 +0000 |
| commit | e4864e0bc2cf9f6a0e450d654f9775cf15e5aa7d (patch) | |
| tree | 377ae08e61e6109a560c7e917ccda964b980a5c9 /libcxx/src | |
| parent | 62ac78ae3e5e8198aaba8acaed891349b3de615f (diff) | |
| download | bcm5719-llvm-e4864e0bc2cf9f6a0e450d654f9775cf15e5aa7d.tar.gz bcm5719-llvm-e4864e0bc2cf9f6a0e450d654f9775cf15e5aa7d.zip | |
More on adding sized deallocation functions in libc++: Continuing from r229281, this adds version guards and test cases.
llvm-svn: 229968
Diffstat (limited to 'libcxx/src')
| -rw-r--r-- | libcxx/src/new.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libcxx/src/new.cpp b/libcxx/src/new.cpp index a9b3733df08..c46d073fa99 100644 --- a/libcxx/src/new.cpp +++ b/libcxx/src/new.cpp @@ -126,23 +126,23 @@ operator delete(void* ptr) _NOEXCEPT _LIBCPP_WEAK _LIBCPP_NEW_DELETE_VIS void -operator delete(void* ptr, size_t) _NOEXCEPT +operator delete(void* ptr, const std::nothrow_t&) _NOEXCEPT { ::operator delete(ptr); } _LIBCPP_WEAK _LIBCPP_NEW_DELETE_VIS void -operator delete(void* ptr, const std::nothrow_t&) _NOEXCEPT +operator delete(void* ptr, size_t) _NOEXCEPT { ::operator delete(ptr); } _LIBCPP_WEAK _LIBCPP_NEW_DELETE_VIS void -operator delete(void* ptr, size_t, const std::nothrow_t&) _NOEXCEPT +operator delete(void* ptr, size_t, const std::nothrow_t& nt) _NOEXCEPT { - ::operator delete(ptr); + ::operator delete(ptr, nt); } _LIBCPP_WEAK _LIBCPP_NEW_DELETE_VIS @@ -154,23 +154,23 @@ operator delete[] (void* ptr) _NOEXCEPT _LIBCPP_WEAK _LIBCPP_NEW_DELETE_VIS void -operator delete[] (void* ptr, size_t) _NOEXCEPT +operator delete[] (void* ptr, const std::nothrow_t&) _NOEXCEPT { ::operator delete[](ptr); } _LIBCPP_WEAK _LIBCPP_NEW_DELETE_VIS void -operator delete[] (void* ptr, const std::nothrow_t&) _NOEXCEPT +operator delete[] (void* ptr, size_t) _NOEXCEPT { ::operator delete[](ptr); } _LIBCPP_WEAK _LIBCPP_NEW_DELETE_VIS void -operator delete[] (void* ptr, size_t, const std::nothrow_t&) _NOEXCEPT +operator delete[] (void* ptr, size_t, const std::nothrow_t& nt) _NOEXCEPT { - ::operator delete[](ptr); + ::operator delete[](ptr, nt); } #endif // !__GLIBCXX__ |
