summaryrefslogtreecommitdiffstats
path: root/libcxx/test/support/test_memory_resource.hpp
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2018-05-29 00:08:47 +0000
committerEric Fiselier <eric@efcs.ca>2018-05-29 00:08:47 +0000
commitbd2e949869cd238d5d94812007953cf6fe6f4d84 (patch)
treecd00a155c8c557fb941851e71f79b7720e157c61 /libcxx/test/support/test_memory_resource.hpp
parentdcfcfdb0d166fff8388bdd2edc5a2948054c9da1 (diff)
downloadbcm5719-llvm-bd2e949869cd238d5d94812007953cf6fe6f4d84.tar.gz
bcm5719-llvm-bd2e949869cd238d5d94812007953cf6fe6f4d84.zip
LWG 2969 "polymorphic_allocator::construct() shouldn't pass resource()"
Patch from Arthur O'Dwyer. In the TS, `uses_allocator` construction for `pair` tried to use an allocator type of `memory_resource*`, which is incorrect because `memory_resource*` is not an allocator type. LWG 2969 fixed it to use `polymorphic_allocator` as the allocator type instead. https://wg21.link/lwg2969 (D47090 included this in `<memory_resource>`; at Eric's request, I've split this out into its own patch applied to the existing `<experimental/memory_resource>` instead.) Reviewed as https://reviews.llvm.org/D47109 llvm-svn: 333384
Diffstat (limited to 'libcxx/test/support/test_memory_resource.hpp')
-rw-r--r--libcxx/test/support/test_memory_resource.hpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/test/support/test_memory_resource.hpp b/libcxx/test/support/test_memory_resource.hpp
index b3472c8b610..4b8167ba039 100644
--- a/libcxx/test/support/test_memory_resource.hpp
+++ b/libcxx/test/support/test_memory_resource.hpp
@@ -28,7 +28,7 @@
// because it can't include <experimental/memory_resource>
template <>
struct TransformErasedTypeAlloc<std::experimental::erased_type> {
- using type = std::experimental::pmr::memory_resource*;
+ using type = std::experimental::pmr::polymorphic_allocator<int>;
};
template <class ProviderT, int = 0>
OpenPOWER on IntegriCloud