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

Backport from mainline
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.

From-SVN: r251672

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index d876052b2a8693671b125421903a63ee4b46dea0..6ca4a210ede24ddae7f6caf8e0bb7b5e2fde4fc0 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,12 @@
 2017-09-04  Jonathan Wakely  <jwakely@redhat.com>
 
+       Backport from mainline
+       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.
+
        Backport from mainline
        2017-08-18  Jonathan Wakely  <jwakely@redhat.com>
 

diff --git a/libstdc++-v3/include/ext/new_allocator.h b/libstdc++-v3/include/ext/new_allocator.h
index 83e3a0b0a8f8e628f490efebae2d16f881934930..fcc5ff4dae3039b224e536b67ed33fffa3fbeb6c 100644 (file)
--- a/libstdc++-v3/include/ext/new_allocator.h
+++ b/libstdc++-v3/include/ext/new_allocator.h
@@ -96,8 +96,8 @@ _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();