diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2019-07-31 20:08:56 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2019-07-31 20:08:56 +0100 |
| commit | 3090082cbefd8b1374f237bd4242b554490b2933 (patch) | |
| tree | 2821cf67628638ff91c6269b9c80c74abf4f4b9a | |
| parent | 10acaf4db9f8b54bd55fb7a6f5b6bb39a91fb9b8 (diff) | |
| download | gcc-3090082cbefd8b1374f237bd4242b554490b2933.zip gcc-3090082cbefd8b1374f237bd4242b554490b2933.tar.gz gcc-3090082cbefd8b1374f237bd4242b554490b2933.tar.bz2 | |
Qualify call to prevent ADL
* include/std/memory (make_obj_using_allocator): Qualify call to
uses_allocator_construction_args.
From-SVN: r273945
| -rw-r--r-- | libstdc++-v3/ChangeLog | 3 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/memory | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index edc551b..e213f17 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2019-07-31 Jonathan Wakely <jwakely@redhat.com> + * include/std/memory (make_obj_using_allocator): Qualify call to + uses_allocator_construction_args. + P0631R4 Math Constants * include/Makefile.am: Add new header. * include/Makefile.in: Regenerate. diff --git a/libstdc++-v3/include/std/memory b/libstdc++-v3/include/std/memory index 3036802..0a483d2 100644 --- a/libstdc++-v3/include/std/memory +++ b/libstdc++-v3/include/std/memory @@ -375,8 +375,9 @@ get_pointer_safety() noexcept { return pointer_safety::relaxed; } inline _Tp make_obj_using_allocator(const _Alloc& __a, _Args&&... __args) { - return std::make_from_tuple<_Tp>(uses_allocator_construction_args<_Tp>( - __a, std::forward<_Args>(__args)...)); + return std::make_from_tuple<_Tp>( + std::uses_allocator_construction_args<_Tp>(__a, + std::forward<_Args>(__args)...)); } template<typename _Tp, typename _Alloc, typename... _Args> |