diff options
| -rw-r--r-- | libcxx/include/__functional_base | 10 | ||||
| -rw-r--r-- | libcxx/include/experimental/memory_resource | 4 |
2 files changed, 2 insertions, 12 deletions
diff --git a/libcxx/include/__functional_base b/libcxx/include/__functional_base index 12af4dc9675..1a90bd6280f 100644 --- a/libcxx/include/__functional_base +++ b/libcxx/include/__functional_base @@ -646,16 +646,6 @@ void __user_alloc_construct_impl (integral_constant<int, 2>, _Tp *__storage, con new (__storage) _Tp (_VSTD::forward<_Args>(__args)..., __a); } -// FIXME: Theis should have a version which takes a non-const alloc. -template <class _Tp, class _Allocator, class... _Args> -inline _LIBCPP_INLINE_VISIBILITY -void __user_alloc_construct (_Tp *__storage, const _Allocator &__a, _Args &&... __args) -{ - __user_alloc_construct_impl( - __uses_alloc_ctor<_Tp, _Allocator>(), - __storage, __a, _VSTD::forward<_Args>(__args)... - ); -} #endif // _LIBCPP_CXX03_LANG _LIBCPP_END_NAMESPACE_STD diff --git a/libcxx/include/experimental/memory_resource b/libcxx/include/experimental/memory_resource index 748e2e78757..221ce5b8eac 100644 --- a/libcxx/include/experimental/memory_resource +++ b/libcxx/include/experimental/memory_resource @@ -71,7 +71,7 @@ namespace pmr { #include <memory> #include <new> #include <stdexcept> -#include <tuple> +#include <__tuple> #include <type_traits> #include <utility> #include <cstddef> @@ -96,7 +96,7 @@ size_t __aligned_allocation_size(size_t __s, size_t __a) _NOEXCEPT } // 8.5, memory.resource -class _LIBCPP_TEMPLATE_VIS memory_resource +class _LIBCPP_TYPE_VIS memory_resource { static const size_t __max_align = alignof(max_align_t); |
