llvm/libcxx
1
0
Fork 0
mirror of https://github.com/llvm-mirror/libcxx.git synced 2025-10-24 03:32:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Adjust uses_alloc_types helpers for later changes

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@287512 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2016-11-21 00:41:32 +00:00
parent 6f7f0b8530
commit 388ffe1db1
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
test/support/uses_alloc_types.hpp
View File

@@ -191,7 +191,7 @@ private:
typename detail::Identity<LArgs>::type..., CtorAlloc const& alloc) { typename detail::Identity<LArgs>::type..., CtorAlloc const& alloc) {
return alloc; return alloc;
} }
public:
const TypeID* args_id; const TypeID* args_id;
UsesAllocatorType constructor_called = UA_None; UsesAllocatorType constructor_called = UA_None;
CtorAlloc allocator; CtorAlloc allocator;
@@ -208,6 +208,10 @@ public:
UsesAllocatorV1() : Base(&makeArgumentID<>()) {} UsesAllocatorV1() : Base(&makeArgumentID<>()) {}
UsesAllocatorV1(UsesAllocatorV1 const&)
: Base(&makeArgumentID<UsesAllocatorV1 const&>()) {}
UsesAllocatorV1(UsesAllocatorV1 &&)
: Base(&makeArgumentID<UsesAllocatorV1 &&>()) {}
// Non-Uses Allocator Ctor // Non-Uses Allocator Ctor
template <class ...Args, EnableIfB<sizeof...(Args) == Arity> = false> template <class ...Args, EnableIfB<sizeof...(Args) == Arity> = false>
UsesAllocatorV1(Args&&... args) : Base(&makeArgumentID<Args&&...>()) {}; UsesAllocatorV1(Args&&... args) : Base(&makeArgumentID<Args&&...>()) {};
@@ -237,6 +241,10 @@ public:
using CtorAlloc = typename Base::CtorAlloc; using CtorAlloc = typename Base::CtorAlloc;
UsesAllocatorV2() : Base(&makeArgumentID<>()) {} UsesAllocatorV2() : Base(&makeArgumentID<>()) {}
UsesAllocatorV2(UsesAllocatorV2 const&)
: Base(&makeArgumentID<UsesAllocatorV2 const&>()) {}
UsesAllocatorV2(UsesAllocatorV2 &&)
: Base(&makeArgumentID<UsesAllocatorV2 &&>()) {}
// Non-Uses Allocator Ctor // Non-Uses Allocator Ctor
template <class ...Args, EnableIfB<sizeof...(Args) == Arity> = false> template <class ...Args, EnableIfB<sizeof...(Args) == Arity> = false>
@@ -259,6 +267,10 @@ public:
using CtorAlloc = typename Base::CtorAlloc; using CtorAlloc = typename Base::CtorAlloc;
UsesAllocatorV3() : Base(&makeArgumentID<>()) {} UsesAllocatorV3() : Base(&makeArgumentID<>()) {}
UsesAllocatorV3(UsesAllocatorV3 const&)
: Base(&makeArgumentID<UsesAllocatorV3 const&>()) {}
UsesAllocatorV3(UsesAllocatorV3 &&)
: Base(&makeArgumentID<UsesAllocatorV3 &&>()) {}
// Non-Uses Allocator Ctor // Non-Uses Allocator Ctor
template <class ...Args, EnableIfB<sizeof...(Args) == Arity> = false> template <class ...Args, EnableIfB<sizeof...(Args) == Arity> = false>
@@ -287,7 +299,10 @@ public:
using CtorAlloc = typename Base::CtorAlloc; using CtorAlloc = typename Base::CtorAlloc;
NotUsesAllocator() : Base(&makeArgumentID<>()) {} NotUsesAllocator() : Base(&makeArgumentID<>()) {}
NotUsesAllocator(NotUsesAllocator const&)
: Base(&makeArgumentID<NotUsesAllocator const&>()) {}
NotUsesAllocator(NotUsesAllocator &&)
: Base(&makeArgumentID<NotUsesAllocator &&>()) {}
// Non-Uses Allocator Ctor // Non-Uses Allocator Ctor
template <class ...Args, EnableIfB<sizeof...(Args) == Arity> = false> template <class ...Args, EnableIfB<sizeof...(Args) == Arity> = false>
NotUsesAllocator(Args&&... args) : Base(&makeArgumentID<Args&&...>()) {}; NotUsesAllocator(Args&&... args) : Base(&makeArgumentID<Args&&...>()) {};