From: Jason Merrill <jason@redhat.com>
Date: Thu, 21 May 2015 15:12:40 +0000 (-0400)
Subject: del_opv.cc: Suppress -Wsized-deallocation.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4177264e09e997c54a58a714fde0588592a87c65;p=gcc.git

del_opv.cc: Suppress -Wsized-deallocation.

	* libsupc++/del_opv.cc: Suppress -Wsized-deallocation.
	* libsupc++/del_op.cc: Likewise.

From-SVN: r223488
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 5797c970f4b..3b44f54e91f 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2015-05-21  Jason Merrill  <jason@redhat.com>
+
+	* libsupc++/del_opv.cc: Suppress -Wsized-deallocation.
+	* libsupc++/del_op.cc: Likewise.
+
 2015-05-20  François Dumont  <fdumont@gcc.gnu.org>
 
 	* include/debug/formatter.h (_GLIBCXX_TYPEID): New macro to simplify
diff --git a/libstdc++-v3/libsupc++/del_op.cc b/libstdc++-v3/libsupc++/del_op.cc
index 06eb2a0f062..8e7aa2f2d60 100644
--- a/libstdc++-v3/libsupc++/del_op.cc
+++ b/libstdc++-v3/libsupc++/del_op.cc
@@ -40,6 +40,9 @@ _GLIBCXX_END_NAMESPACE_VERSION
 
 #include "new"
 
+// The sized deletes are defined in other files.
+#pragma GCC diagnostic ignored "-Wsized-deallocation"
+
 _GLIBCXX_WEAK_DEFINITION void
 operator delete(void* ptr) _GLIBCXX_USE_NOEXCEPT
 {
diff --git a/libstdc++-v3/libsupc++/del_opv.cc b/libstdc++-v3/libsupc++/del_opv.cc
index 6fc1710d4a0..0a050bb35b7 100644
--- a/libstdc++-v3/libsupc++/del_opv.cc
+++ b/libstdc++-v3/libsupc++/del_opv.cc
@@ -26,6 +26,9 @@
 #include <bits/c++config.h>
 #include "new"
 
+// The sized deletes are defined in other files.
+#pragma GCC diagnostic ignored "-Wsized-deallocation"
+
 _GLIBCXX_WEAK_DEFINITION void
 operator delete[] (void *ptr) _GLIBCXX_USE_NOEXCEPT
 {