mirror of
https://github.com/llvm-mirror/libcxx.git
synced 2025-10-23 18:38:30 +08:00
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 git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@334069 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -646,16 +646,6 @@ void __user_alloc_construct_impl (integral_constant<int, 2>, _Tp *__storage, con
|
|||||||
new (__storage) _Tp (_VSTD::forward<_Args>(__args)..., __a);
|
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
|
#endif // _LIBCPP_CXX03_LANG
|
||||||
|
|
||||||
_LIBCPP_END_NAMESPACE_STD
|
_LIBCPP_END_NAMESPACE_STD
|
||||||
|
@@ -71,7 +71,7 @@ namespace pmr {
|
|||||||
#include <memory>
|
#include <memory>
|
||||||
#include <new>
|
#include <new>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <tuple>
|
#include <__tuple>
|
||||||
#include <type_traits>
|
#include <type_traits>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
@@ -96,7 +96,7 @@ size_t __aligned_allocation_size(size_t __s, size_t __a) _NOEXCEPT
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 8.5, memory.resource
|
// 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);
|
static const size_t __max_align = alignof(max_align_t);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user