libstdc++: Fix non-reserved name in std::allocator base class [PR64135]
authorJonathan Wakely <jwakely@redhat.com>
Wed, 1 Dec 2021 17:56:23 +0000 (17:56 +0000)
committerJonathan Wakely <jwakely@redhat.com>
Thu, 9 Dec 2021 22:50:10 +0000 (22:50 +0000)
commitfe9571a35db53e5203326f854f73e432691d67f6
tree23acac00e45e11c3114e609d1578ff410d93bfaf
parentf157c5362b4844f7676cae2aba81a4cf75bd68d5
libstdc++: Fix non-reserved name in std::allocator base class [PR64135]

The possible base classes of std::allocator are new_allocator and
malloc_allocator, which both cause a non-reserved name to be declared in
every program that includes the definition of std::allocator. This is
non-conforming.

This change replaces __gnu_cxx::new_allocator with std::__new_allocator
which is identical except for using a reserved name. The non-standard
extension __gnu_cxx::new_allocator is preserved as a thin wrapper over
std::__new_allocator. There is no problem with the extension using a
non-reserved name now that it's not included by default in other
headers.

The same change could be done to __gnu_cxx::malloc_allocator but as it's
not the default configuration it can wait.

libstdc++-v3/ChangeLog:

PR libstdc++/64135
* config/allocator/new_allocator_base.h: Include
<bits/new_allocator.h> instead of <ext/new_allocator.h>.
(__allocator_base): Use std::__new_allocator instead of
__gnu_cxx::new_allocator.
* doc/xml/manual/allocator.xml: Document new default base class
for std::allocator.
* doc/xml/manual/evolution.xml: Likewise.
* doc/html/*: Regenerate.
* include/Makefile.am: Add bits/new_allocator.h.
* include/Makefile.in: Regenerate.
* include/experimental/memory_resource (new_delete_resource):
Use std::__new_allocator instead of __gnu_cxx::new_allocator.
* include/ext/new_allocator.h (new_allocator): Derive from
std::__new_allocator. Move implementation to ...
* include/bits/new_allocator.h: New file.
* testsuite/20_util/allocator/64135.cc: New test.
libstdc++-v3/config/allocator/new_allocator_base.h
libstdc++-v3/doc/html/manual/api.html
libstdc++-v3/doc/html/manual/memory.html
libstdc++-v3/doc/xml/manual/allocator.xml
libstdc++-v3/doc/xml/manual/evolution.xml
libstdc++-v3/include/Makefile.am
libstdc++-v3/include/Makefile.in
libstdc++-v3/include/bits/new_allocator.h [new file with mode: 0644]
libstdc++-v3/include/experimental/memory_resource
libstdc++-v3/include/ext/new_allocator.h
libstdc++-v3/testsuite/20_util/allocator/64135.cc [new file with mode: 0644]