diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2015-05-18 17:48:45 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2015-05-18 17:48:45 +0000 |
| commit | 0e166e5a9a98ab9112d9d07e9e5c9af300730211 (patch) | |
| tree | 325a941e8a61a930cb6cd2ef0cd4188088a62a65 /libcxx/include/new | |
| parent | 12c41af07c95e3e640f8dfe4699328ef4f1824e6 (diff) | |
| download | bcm5719-llvm-0e166e5a9a98ab9112d9d07e9e5c9af300730211.tar.gz bcm5719-llvm-0e166e5a9a98ab9112d9d07e9e5c9af300730211.zip | |
Fix for LWG Issue 2458: N3778 and new library deallocation signatures.
llvm-svn: 237592
Diffstat (limited to 'libcxx/include/new')
| -rw-r--r-- | libcxx/include/new | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libcxx/include/new b/libcxx/include/new index 29c1a839680..11f8fe66717 100644 --- a/libcxx/include/new +++ b/libcxx/include/new @@ -52,16 +52,12 @@ void* operator new(std::size_t size, const std::nothrow_t&) noexcept; // repla void operator delete(void* ptr) noexcept; // replaceable void operator delete(void* ptr, std::size_t size) noexcept; // replaceable, C++14 void operator delete(void* ptr, const std::nothrow_t&) noexcept; // replaceable -void operator delete(void* ptr, std::size_t size, - const std::nothrow_t&) noexcept; // replaceable, C++14 void* operator new[](std::size_t size); // replaceable void* operator new[](std::size_t size, const std::nothrow_t&) noexcept; // replaceable void operator delete[](void* ptr) noexcept; // replaceable void operator delete[](void* ptr, std::size_t size) noexcept; // replaceable, C++14 void operator delete[](void* ptr, const std::nothrow_t&) noexcept; // replaceable -void operator delete[](void* ptr, std::size_t size, - const std::nothrow_t&) noexcept; // replaceable, C++14 void* operator new (std::size_t size, void* ptr) noexcept; void* operator new[](std::size_t size, void* ptr) noexcept; @@ -142,7 +138,6 @@ _LIBCPP_NEW_DELETE_VIS void operator delete(void* __p) _NOEXCEPT; _LIBCPP_NEW_DELETE_VIS void operator delete(void* __p, const std::nothrow_t&) _NOEXCEPT; #if defined(_LIBCPP_BUILDING_NEW) || _LIBCPP_STD_VER >= 14 _LIBCPP_NEW_DELETE_VIS void operator delete(void* __p, std::size_t __sz) _NOEXCEPT; -_LIBCPP_NEW_DELETE_VIS void operator delete(void* __p, std::size_t __sz, const std::nothrow_t&) _NOEXCEPT; #endif _LIBCPP_NEW_DELETE_VIS void* operator new[](std::size_t __sz) @@ -155,7 +150,6 @@ _LIBCPP_NEW_DELETE_VIS void operator delete[](void* __p) _NOEXCEPT; _LIBCPP_NEW_DELETE_VIS void operator delete[](void* __p, const std::nothrow_t&) _NOEXCEPT; #if defined(_LIBCPP_BUILDING_NEW) || _LIBCPP_STD_VER >= 14 _LIBCPP_NEW_DELETE_VIS void operator delete[](void* __p, std::size_t __sz) _NOEXCEPT; -_LIBCPP_NEW_DELETE_VIS void operator delete[](void* __p, std::size_t __sz, const std::nothrow_t&) _NOEXCEPT; #endif inline _LIBCPP_INLINE_VISIBILITY void* operator new (std::size_t, void* __p) _NOEXCEPT {return __p;} |
