diff options
Diffstat (limited to 'libcxx/test/std/utilities/memory/specialized.algorithms')
6 files changed, 6 insertions, 12 deletions
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.default/uninitialized_default_construct.pass.cpp b/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.default/uninitialized_default_construct.pass.cpp index 6bdb49cad88..cd57769df2e 100644 --- a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.default/uninitialized_default_construct.pass.cpp +++ b/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.default/uninitialized_default_construct.pass.cpp @@ -20,7 +20,6 @@ #include "test_macros.h" #include "test_iterators.h" -#include "test_throw.h" struct Counted { static int count; @@ -43,7 +42,7 @@ struct ThrowsCounted { explicit ThrowsCounted() { ++constructed; if (throw_after > 0 && --throw_after == 0) { - test_throw<int>(); + TEST_THROW(1); } ++count; } diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.default/uninitialized_default_construct_n.pass.cpp b/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.default/uninitialized_default_construct_n.pass.cpp index f59ea8256c0..bfb74b99ecd 100644 --- a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.default/uninitialized_default_construct_n.pass.cpp +++ b/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.default/uninitialized_default_construct_n.pass.cpp @@ -20,7 +20,6 @@ #include "test_macros.h" #include "test_iterators.h" -#include "test_throw.h" struct Counted { static int count; @@ -43,7 +42,7 @@ struct ThrowsCounted { explicit ThrowsCounted() { ++constructed; if (throw_after > 0 && --throw_after == 0) { - test_throw<int>(); + TEST_THROW(1); } ++count; } diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.value/uninitialized_value_construct.pass.cpp b/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.value/uninitialized_value_construct.pass.cpp index 3f73b60a6e2..befe30a6c03 100644 --- a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.value/uninitialized_value_construct.pass.cpp +++ b/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.value/uninitialized_value_construct.pass.cpp @@ -20,7 +20,6 @@ #include "test_macros.h" #include "test_iterators.h" -#include "test_throw.h" struct Counted { static int count; @@ -43,7 +42,7 @@ struct ThrowsCounted { explicit ThrowsCounted() { ++constructed; if (throw_after > 0 && --throw_after == 0) { - test_throw<int>(); + TEST_THROW(1); } ++count; } diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.value/uninitialized_value_construct_n.pass.cpp b/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.value/uninitialized_value_construct_n.pass.cpp index 65f9523f8c1..323d00f7c9c 100644 --- a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.value/uninitialized_value_construct_n.pass.cpp +++ b/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.value/uninitialized_value_construct_n.pass.cpp @@ -20,7 +20,6 @@ #include "test_macros.h" #include "test_iterators.h" -#include "test_throw.h" struct Counted { static int count; @@ -42,7 +41,7 @@ struct ThrowsCounted { explicit ThrowsCounted() { ++constructed; if (throw_after > 0 && --throw_after == 0) { - test_throw<int>(); + TEST_THROW(1); } ++count; } diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.move/uninitialized_move.pass.cpp b/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.move/uninitialized_move.pass.cpp index 51fb06b9a05..6149838218e 100644 --- a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.move/uninitialized_move.pass.cpp +++ b/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.move/uninitialized_move.pass.cpp @@ -20,7 +20,6 @@ #include "test_macros.h" #include "test_iterators.h" -#include "test_throw.h" struct Counted { static int count; @@ -43,7 +42,7 @@ struct ThrowsCounted { explicit ThrowsCounted(int&& x) { ++constructed; if (throw_after > 0 && --throw_after == 0) { - test_throw<int>(); + TEST_THROW(1); } ++count; x = 0; diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.move/uninitialized_move_n.pass.cpp b/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.move/uninitialized_move_n.pass.cpp index 58866e16551..cf6af7472b8 100644 --- a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.move/uninitialized_move_n.pass.cpp +++ b/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.move/uninitialized_move_n.pass.cpp @@ -20,7 +20,6 @@ #include "test_macros.h" #include "test_iterators.h" -#include "test_throw.h" struct Counted { static int count; @@ -43,7 +42,7 @@ struct ThrowsCounted { explicit ThrowsCounted(int&& x) { ++constructed; if (throw_after > 0 && --throw_after == 0) { - test_throw<int>(); + TEST_THROW(1); } ++count; x = 0; |
