[PATCH] Proposed Resolution for LWG Issue #2458: N3778 and new library deallocation signatures

[Marshall Clow]

Hi EricWF,

http://www.open-std.org/jtc1/sc22/wg21/docs/lwg-active.html#2458

http://reviews.llvm.org/D9413

Files:
  include/new
  src/new.cpp

Index: include/new
===================================================================
--- include/new
+++ include/new
@@ -52,16 +52,12 @@
 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;
Index: src/new.cpp
===================================================================
--- src/new.cpp
+++ src/new.cpp
@@ -140,13 +140,6 @@
 
 _LIBCPP_WEAK _LIBCPP_NEW_DELETE_VIS
 void
-operator delete(void* ptr, size_t, const std::nothrow_t& nt) _NOEXCEPT
-{
-    ::operator delete(ptr, nt);
-}
-
-_LIBCPP_WEAK _LIBCPP_NEW_DELETE_VIS
-void
 operator delete[] (void* ptr) _NOEXCEPT
 {
     ::operator delete(ptr);
@@ -166,13 +159,6 @@
     ::operator delete[](ptr);
 }
 
-_LIBCPP_WEAK _LIBCPP_NEW_DELETE_VIS
-void
-operator delete[] (void* ptr, size_t, const std::nothrow_t& nt) _NOEXCEPT
-{
-    ::operator delete[](ptr, nt);
-}
-
 #endif // !__GLIBCXX__
 
 namespace std

EMAIL PREFERENCES
  http://reviews.llvm.org/settings/panel/emailpreferences/

Index: include/new
===================================================================
--- include/new
+++ include/new
@@ -52,16 +52,12 @@
 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;
Index: src/new.cpp
===================================================================
--- src/new.cpp
+++ src/new.cpp
@@ -140,13 +140,6 @@
 
 _LIBCPP_WEAK _LIBCPP_NEW_DELETE_VIS
 void
-operator delete(void* ptr, size_t, const std::nothrow_t& nt) _NOEXCEPT
-{
-    ::operator delete(ptr, nt);
-}
-
-_LIBCPP_WEAK _LIBCPP_NEW_DELETE_VIS
-void
 operator delete[] (void* ptr) _NOEXCEPT
 {
     ::operator delete(ptr);
@@ -166,13 +159,6 @@
     ::operator delete[](ptr);
 }
 
-_LIBCPP_WEAK _LIBCPP_NEW_DELETE_VIS
-void
-operator delete[] (void* ptr, size_t, const std::nothrow_t& nt) _NOEXCEPT
-{
-    ::operator delete[](ptr, nt);
-}
-
 #endif // !__GLIBCXX__
 
 namespace std

_______________________________________________
cfe-commits mailing list
cfe-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits