From 72b5d0d0806f11155775e23d1fbd5f2bc92ee3ac Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Tue, 18 Jan 2022 18:45:42 +0000 Subject: [PATCH] Deal with STL_extension --- .../test/STL_Extension/test_Object.cpp | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/STL_Extension/test/STL_Extension/test_Object.cpp b/STL_Extension/test/STL_Extension/test_Object.cpp index 7ab6f715948..705779bee86 100644 --- a/STL_Extension/test/STL_Extension/test_Object.cpp +++ b/STL_Extension/test/STL_Extension/test_Object.cpp @@ -2,40 +2,40 @@ #include #include -#include #include #include +#include void from_opt_var() { int i = 0; double j = 0.0; - CGAL_USE(i); CGAL_USE(j); + boost::optional< boost::variant > v(23); CGAL::Object o = v; - CGAL_assertion(!o.empty()); - CGAL_assertion(CGAL::assign(i, o)); - CGAL_assertion(i == 23); + assert(!o.empty()); + assert(CGAL::assign(i, o)); + assert(i == 23); //reassign the variant and assign it again v = 2.0; o = v; - CGAL_assertion(!CGAL::assign(i, o)); - CGAL_assertion(CGAL::assign(j, o)); - CGAL_assertion(j == 2.0); + assert(!CGAL::assign(i, o)); + assert(CGAL::assign(j, o)); + assert(j == 2.0); //empty optional boost::optional< boost::variant > v2; CGAL::Object o2 = v2; - CGAL_assertion(o2.empty()); + assert(o2.empty()); } void from_var() { int i = 0; - CGAL_USE(i); + boost::variant v(23); CGAL::Object o = v; - CGAL_assertion(!o.empty()); - CGAL_assertion(CGAL::assign(i, o)); - CGAL_assertion(i == 23); + assert(!o.empty()); + assert(CGAL::assign(i, o)); + assert(i == 23); } struct Foo { @@ -43,19 +43,19 @@ struct Foo { void make_object_and_assign() { int i = 23, j = 0; - CGAL_USE(j); + CGAL::Object o = CGAL::make_object(i); - CGAL_assertion(CGAL::assign(j, o)); - CGAL_assertion(j == i); - CGAL_assertion(CGAL::object_cast(&o) == nullptr); - CGAL_assertion(CGAL::object_cast(&o) != nullptr); + assert(CGAL::assign(j, o)); + assert(j == i); + assert(CGAL::object_cast(&o) == nullptr); + assert(CGAL::object_cast(&o) != nullptr); } void safe_bool() { CGAL::Object o; - CGAL_assertion(!o); + assert(!o); CGAL::Object o2 = CGAL::make_object(23); - CGAL_assertion(o2); + assert(o2); // dummy code, we want to bork on this // if(o == o2) ;