summaryrefslogtreecommitdiffstats
path: root/libcxx/include/experimental
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2018-06-06 06:42:27 +0000
committerEric Fiselier <eric@efcs.ca>2018-06-06 06:42:27 +0000
commitcb5b004a9b2ed3e3d0d1636628549bfc0fbe6716 (patch)
treefa104d2fd23e4a56e853f5c979216625363dfcf0 /libcxx/include/experimental
parentfc9b29bd617922a9c6fc3b602e075b353f5c2395 (diff)
downloadbcm5719-llvm-cb5b004a9b2ed3e3d0d1636628549bfc0fbe6716.tar.gz
bcm5719-llvm-cb5b004a9b2ed3e3d0d1636628549bfc0fbe6716.zip
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
Diffstat (limited to 'libcxx/include/experimental')
-rw-r--r--libcxx/include/experimental/memory_resource4
1 files changed, 2 insertions, 2 deletions
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);
OpenPOWER on IntegriCloud