From: Jonathan Wakely <jwakely@redhat.com>
Date: Thu, 31 Aug 2017 16:45:37 +0000 (+0100)
Subject: PR c++/82039 suppress -Wzero-as-null-pointer-constant warning
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=89c6ecfa4c1aabd60edb7f5c31556444ddcd3d7f;p=gcc.git

PR c++/82039 suppress -Wzero-as-null-pointer-constant warning

	PR c++/82039
	* include/ext/new_allocator.h (__gnu_cxx::new_allocator::allocate):
	Adjust null pointer constant to avoid warning.

From-SVN: r251570
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index cfc1ed359a1..ed1003a5fc4 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2017-08-31  Jonathan Wakely  <jwakely@redhat.com>
+
+	PR c++/82039
+	* include/ext/new_allocator.h (__gnu_cxx::new_allocator::allocate):
+	Adjust null pointer constant to avoid warning.
+
 2017-08-24  François Dumont  <fdumont@gcc.gnu.org>
 
 	* include/bits/stl_list.h
diff --git a/libstdc++-v3/include/ext/new_allocator.h b/libstdc++-v3/include/ext/new_allocator.h
index ee64b9c6447..e1e152c4bf0 100644
--- a/libstdc++-v3/include/ext/new_allocator.h
+++ b/libstdc++-v3/include/ext/new_allocator.h
@@ -96,7 +96,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       // NB: __n is permitted to be 0.  The C++ standard says nothing
       // about what the return value is when __n == 0.
       pointer
-      allocate(size_type __n, const void* = 0)
+      allocate(size_type __n, const void* = static_cast<const void*>(0))
       {
 	if (__n > this->max_size())
 	  std::__throw_bad_alloc();