diff options
| author | bergner <bergner@138bc75d-0d04-0410-961f-82ee72b054a4> | 2018-01-31 16:48:55 +0000 |
|---|---|---|
| committer | bergner <bergner@138bc75d-0d04-0410-961f-82ee72b054a4> | 2018-01-31 16:48:55 +0000 |
| commit | 902cd6dd49bf20366e8dc36e6a4d42cf950272e9 (patch) | |
| tree | ec91e91423ee02faa10d1a503d4bdd4cc9181e62 /libstdc++-v3/include/ext/new_allocator.h | |
| parent | 93085fc30373f8bfcd053ec2fa3f4086026cc6c8 (diff) | |
| parent | 1d872a5cc8e006bb6ecc69894063c9127d6a8182 (diff) | |
Merge up to 257158.ibm/gcc-6-branch
* REVISION: Update subversion id.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/ibm/gcc-6-branch@257243 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/ext/new_allocator.h')
| -rw-r--r-- | libstdc++-v3/include/ext/new_allocator.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libstdc++-v3/include/ext/new_allocator.h b/libstdc++-v3/include/ext/new_allocator.h index dd00b7384aa..2278e123fc5 100644 --- 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(); |