From 89c6ecfa4c1aabd60edb7f5c31556444ddcd3d7f Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 31 Aug 2017 17:45:37 +0100 Subject: [PATCH] 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 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/include/ext/new_allocator.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) 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 + + 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 * 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(0)) { if (__n > this->max_size()) std::__throw_bad_alloc(); -- 2.30.2