diff --git a/xo-alloc/utest/GC.test.cpp b/xo-alloc/utest/GC.test.cpp index 3912e8e4..398336a8 100644 --- a/xo-alloc/utest/GC.test.cpp +++ b/xo-alloc/utest/GC.test.cpp @@ -94,13 +94,13 @@ namespace xo { /** gc-enabled allocator **/ namespace { /** Setup test with custom allocator - * + * **/ template struct TestClass : public GcObjectInterface { TestClass() = default; explicit TestClass(const Nested & member1) : member1_{member1} {} - + // using allocator_type = Allocator; // using allocator_traits = xo::gc::gc_allocator_traits; @@ -182,21 +182,22 @@ namespace xo { Nested member1_; }; - template + //template struct MemberType { public: - using allocator_type = Allocator; - using vector_allocator_type = typename std::allocator_traits::template rebind_alloc>; - using vector_type = std::vector, vector_allocator_type>; + //using allocator_type = Allocator; + //using vector_allocator_type = typename std::allocator_traits::template rebind_alloc>; + using vector_type = std::vector>; + //using vector_type = std::vector, vector_allocator_type>; public: MemberType() : ctor_ran_{true} {} - explicit MemberType(const Allocator & alloc) - : member2_{vector_allocator_type(alloc)}, ctor_ran_{true} {} + //explicit MemberType(const Allocator & alloc) + //: member2_{vector_allocator_type(alloc)}, ctor_ran_{true} {} explicit MemberType(const vector_type & mem2) : member2_{mem2}, ctor_ran_{true} {} - MemberType(const vector_type & mem2, const Allocator & alloc) - : member2_{mem2, vector_allocator_type(alloc)}, ctor_ran_{true} {} + //MemberType(const vector_type & mem2, const Allocator & alloc) + //: member2_{mem2, vector_allocator_type(alloc)}, ctor_ran_{true} {} vector_type member2_; std::size_t ctor_ran_ = false; @@ -223,6 +224,7 @@ namespace xo { using MyObjectInterface = gc_allocator_traits::template object_interface; using NestedElementAllocator = xo::gc::allocator>; using NestedType = MemberType; + //using NestedType = MemberType; using MyType = TestClass; using MyAllocator = xo::gc::allocator; @@ -273,7 +275,7 @@ namespace xo { REQUIRE(false); } } - + } } /*namespace ut*/