diff options
Diffstat (limited to 'libcxx/test/std/utilities/function.objects')
6 files changed, 24 insertions, 24 deletions
diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.alg/swap.pass.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.alg/swap.pass.cpp index 3924274..97f78ac 100644 --- a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.alg/swap.pass.cpp +++ b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.alg/swap.pass.cpp @@ -69,12 +69,12 @@ int main(int, char**) static_assert(noexcept(swap(f1, f2)), "" ); #endif assert(A::count == 2); - assert(globalMemCounter.checkOutstandingNewEq(2)); + assert(globalMemCounter.checkOutstandingNewLessThanOrEqual(2)); RTTI_ASSERT(f1.target<A>()->id() == 1); RTTI_ASSERT(f2.target<A>()->id() == 2); swap(f1, f2); assert(A::count == 2); - assert(globalMemCounter.checkOutstandingNewEq(2)); + assert(globalMemCounter.checkOutstandingNewLessThanOrEqual(2)); RTTI_ASSERT(f1.target<A>()->id() == 2); RTTI_ASSERT(f2.target<A>()->id() == 1); } @@ -87,12 +87,12 @@ int main(int, char**) static_assert(noexcept(swap(f1, f2)), "" ); #endif assert(A::count == 1); - assert(globalMemCounter.checkOutstandingNewEq(1)); + assert(globalMemCounter.checkOutstandingNewLessThanOrEqual(1)); RTTI_ASSERT(f1.target<A>()->id() == 1); RTTI_ASSERT(*f2.target<int(*)(int)>() == g); swap(f1, f2); assert(A::count == 1); - assert(globalMemCounter.checkOutstandingNewEq(1)); + assert(globalMemCounter.checkOutstandingNewLessThanOrEqual(1)); RTTI_ASSERT(*f1.target<int(*)(int)>() == g); RTTI_ASSERT(f2.target<A>()->id() == 1); } @@ -105,12 +105,12 @@ int main(int, char**) static_assert(noexcept(swap(f1, f2)), "" ); #endif assert(A::count == 1); - assert(globalMemCounter.checkOutstandingNewEq(1)); + assert(globalMemCounter.checkOutstandingNewLessThanOrEqual(1)); RTTI_ASSERT(*f1.target<int(*)(int)>() == g); RTTI_ASSERT(f2.target<A>()->id() == 1); swap(f1, f2); assert(A::count == 1); - assert(globalMemCounter.checkOutstandingNewEq(1)); + assert(globalMemCounter.checkOutstandingNewLessThanOrEqual(1)); RTTI_ASSERT(f1.target<A>()->id() == 1); RTTI_ASSERT(*f2.target<int(*)(int)>() == g); } @@ -123,12 +123,12 @@ int main(int, char**) static_assert(noexcept(swap(f1, f2)), "" ); #endif assert(A::count == 0); - assert(globalMemCounter.checkOutstandingNewEq(0)); + assert(globalMemCounter.checkOutstandingNewLessThanOrEqual(0)); RTTI_ASSERT(*f1.target<int(*)(int)>() == g); RTTI_ASSERT(*f2.target<int(*)(int)>() == h); swap(f1, f2); assert(A::count == 0); - assert(globalMemCounter.checkOutstandingNewEq(0)); + assert(globalMemCounter.checkOutstandingNewLessThanOrEqual(0)); RTTI_ASSERT(*f1.target<int(*)(int)>() == h); RTTI_ASSERT(*f2.target<int(*)(int)>() == g); } diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F.pass.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F.pass.cpp index c1ad528..9240957 100644 --- a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F.pass.cpp +++ b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F.pass.cpp @@ -69,7 +69,7 @@ int main(int, char**) { std::function<int(int)> f = A(); assert(A::count == 1); - assert(globalMemCounter.checkOutstandingNewEq(1)); + assert(globalMemCounter.checkOutstandingNewLessThanOrEqual(1)); RTTI_ASSERT(f.target<A>()); RTTI_ASSERT(f.target<int(*)(int)>() == 0); } diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_assign.pass.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_assign.pass.cpp index 75eaa55..e3bd6ef 100644 --- a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_assign.pass.cpp +++ b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_assign.pass.cpp @@ -57,13 +57,13 @@ int main(int, char**) { { std::function<int(int)> f = A(); assert(A::count == 1); - assert(globalMemCounter.checkOutstandingNewEq(1)); + assert(globalMemCounter.checkOutstandingNewLessThanOrEqual(1)); RTTI_ASSERT(f.target<A>()); RTTI_ASSERT(f.target<int (*)(int)>() == 0); std::function<int(int)> f2; f2 = f; assert(A::count == 2); - assert(globalMemCounter.checkOutstandingNewEq(2)); + assert(globalMemCounter.checkOutstandingNewLessThanOrEqual(2)); RTTI_ASSERT(f2.target<A>()); RTTI_ASSERT(f2.target<int (*)(int)>() == 0); } @@ -125,13 +125,13 @@ int main(int, char**) { { std::function<int(int)> f = A(); assert(A::count == 1); - assert(globalMemCounter.checkOutstandingNewEq(1)); + assert(globalMemCounter.checkOutstandingNewLessThanOrEqual(1)); RTTI_ASSERT(f.target<A>()); RTTI_ASSERT(f.target<int (*)(int)>() == 0); std::function<int(int)> f2; f2 = std::move(f); assert(A::count == 1); - assert(globalMemCounter.checkOutstandingNewEq(1)); + assert(globalMemCounter.checkOutstandingNewLessThanOrEqual(1)); RTTI_ASSERT(f2.target<A>()); RTTI_ASSERT(f2.target<int (*)(int)>() == 0); RTTI_ASSERT(f.target<A>() == 0); diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_move.pass.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_move.pass.cpp index 4a2a272..5b3f4f1 100644 --- a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_move.pass.cpp +++ b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_move.pass.cpp @@ -64,12 +64,12 @@ int main(int, char**) { std::function<int(int)> f = A(); assert(A::count == 1); - assert(globalMemCounter.checkOutstandingNewEq(1)); + assert(globalMemCounter.checkOutstandingNewLessThanOrEqual(1)); RTTI_ASSERT(f.target<A>()); RTTI_ASSERT(f.target<int(*)(int)>() == 0); std::function<int(int)> f2 = f; assert(A::count == 2); - assert(globalMemCounter.checkOutstandingNewEq(2)); + assert(globalMemCounter.checkOutstandingNewLessThanOrEqual(2)); RTTI_ASSERT(f2.target<A>()); RTTI_ASSERT(f2.target<int(*)(int)>() == 0); } @@ -113,7 +113,7 @@ int main(int, char**) { // Test rvalue references std::function<int(int)> f = A(); assert(A::count == 1); - assert(globalMemCounter.checkOutstandingNewEq(1)); + assert(globalMemCounter.checkOutstandingNewLessThanOrEqual(1)); RTTI_ASSERT(f.target<A>()); RTTI_ASSERT(f.target<int(*)(int)>() == 0); LIBCPP_ASSERT_NOEXCEPT(std::function<int(int)>(std::move(f))); @@ -122,7 +122,7 @@ int main(int, char**) #endif std::function<int(int)> f2 = std::move(f); assert(A::count == 1); - assert(globalMemCounter.checkOutstandingNewEq(1)); + assert(globalMemCounter.checkOutstandingNewLessThanOrEqual(1)); RTTI_ASSERT(f2.target<A>()); RTTI_ASSERT(f2.target<int(*)(int)>() == 0); RTTI_ASSERT(f.target<A>() == 0); diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/nullptr_t_assign.pass.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/nullptr_t_assign.pass.cpp index 391e2a7..b2f61fa 100644 --- a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/nullptr_t_assign.pass.cpp +++ b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/nullptr_t_assign.pass.cpp @@ -57,7 +57,7 @@ int main(int, char**) { std::function<int(int)> f = A(); assert(A::count == 1); - assert(globalMemCounter.checkOutstandingNewEq(1)); + assert(globalMemCounter.checkOutstandingNewLessThanOrEqual(1)); RTTI_ASSERT(f.target<A>()); f = nullptr; assert(A::count == 0); diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/swap.pass.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/swap.pass.cpp index d51c35e..1723ddf 100644 --- a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/swap.pass.cpp +++ b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/swap.pass.cpp @@ -68,12 +68,12 @@ int main(int, char**) { std::function<int(int)> f1 = A(1); std::function<int(int)> f2 = A(2); assert(A::count == 2); - assert(globalMemCounter.checkOutstandingNewEq(2)); + assert(globalMemCounter.checkOutstandingNewLessThanOrEqual(2)); RTTI_ASSERT(f1.target<A>()->id() == 1); RTTI_ASSERT(f2.target<A>()->id() == 2); f1.swap(f2); assert(A::count == 2); - assert(globalMemCounter.checkOutstandingNewEq(2)); + assert(globalMemCounter.checkOutstandingNewLessThanOrEqual(2)); RTTI_ASSERT(f1.target<A>()->id() == 2); RTTI_ASSERT(f2.target<A>()->id() == 1); } @@ -83,12 +83,12 @@ int main(int, char**) { std::function<int(int)> f1 = A(1); std::function<int(int)> f2 = g; assert(A::count == 1); - assert(globalMemCounter.checkOutstandingNewEq(1)); + assert(globalMemCounter.checkOutstandingNewLessThanOrEqual(1)); RTTI_ASSERT(f1.target<A>()->id() == 1); RTTI_ASSERT(*f2.target<int (*)(int)>() == g); f1.swap(f2); assert(A::count == 1); - assert(globalMemCounter.checkOutstandingNewEq(1)); + assert(globalMemCounter.checkOutstandingNewLessThanOrEqual(1)); RTTI_ASSERT(*f1.target<int (*)(int)>() == g); RTTI_ASSERT(f2.target<A>()->id() == 1); } @@ -98,12 +98,12 @@ int main(int, char**) { std::function<int(int)> f1 = g; std::function<int(int)> f2 = A(1); assert(A::count == 1); - assert(globalMemCounter.checkOutstandingNewEq(1)); + assert(globalMemCounter.checkOutstandingNewLessThanOrEqual(1)); RTTI_ASSERT(*f1.target<int (*)(int)>() == g); RTTI_ASSERT(f2.target<A>()->id() == 1); f1.swap(f2); assert(A::count == 1); - assert(globalMemCounter.checkOutstandingNewEq(1)); + assert(globalMemCounter.checkOutstandingNewLessThanOrEqual(1)); RTTI_ASSERT(f1.target<A>()->id() == 1); RTTI_ASSERT(*f2.target<int (*)(int)>() == g); } |