From cb5b004a9b2ed3e3d0d1636628549bfc0fbe6716 Mon Sep 17 00:00:00 2001
From: Eric Fiselier <eric@efcs.ca>
Date: Wed, 6 Jun 2018 06:42:27 +0000
Subject: Remove unused code from __functional_base. NFC.

Patch from Arthur O'Dwyer.

`__user_alloc_construct_impl` is used by <experimental/memory_resource>, but
this `__user_alloc_construct` is never used.

Also, `<experimental/memory_resource>` doesn't need a full definition of
`std::tuple`; just the forward declaration in `<__tuple>` will suffice.

Reviewed as https://reviews.llvm.org/D46806

llvm-svn: 334069
---
 libcxx/include/experimental/memory_resource | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'libcxx/include/experimental')

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);
 
-- 
cgit v1.2.3