From 9b0b6d45d2a0c41bccd96cb53dc6796e1ee680a3 Mon Sep 17 00:00:00 2001 From: Howard Hinnant Date: Fri, 20 Aug 2010 19:36:46 +0000 Subject: Installed allocator into std::function llvm-svn: 111672 --- .../func.wrap.func.con/alloc_rfunction.pass.cpp | 61 +++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) (limited to 'libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp') diff --git a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp index 15e4dad2323..263cd81aee1 100644 --- a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp +++ b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp @@ -16,7 +16,66 @@ #include #include +#include "../test_allocator.h" + +int new_called = 0; + +void* operator new(std::size_t s) throw(std::bad_alloc) +{ + ++new_called; + return std::malloc(s); +} + +void operator delete(void* p) throw() +{ + --new_called; + std::free(p); +} + +class A +{ + int data_[10]; +public: + static int count; + + A() + { + ++count; + for (int i = 0; i < 10; ++i) + data_[i] = i; + } + + A(const A&) {++count;} + + ~A() {--count;} + + int operator()(int i) const + { + for (int j = 0; j < 10; ++j) + i += data_[j]; + return i; + } +}; + +int A::count = 0; + int main() { -#error template function(allocator_arg_t, const A&, function&&); not implemented +#ifdef _LIBCPP_MOVE + assert(new_called == 0); + { + std::function f = A(); + assert(A::count == 1); + assert(new_called == 1); + assert(f.target()); + assert(f.target() == 0); + std::function f2(std::allocator_arg, test_allocator(), std::move(f)); + assert(A::count == 1); + assert(new_called == 1); + assert(f2.target()); + assert(f2.target() == 0); + assert(f.target() == 0); + assert(f.target() == 0); + } +#endif } -- cgit v1.2.3