From 5cc398f7fe779ce692f41c7444f7b5d3cb595cad Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Fri, 22 Mar 2013 16:41:54 +0100 Subject: [PATCH] also test leda if it is available --- .../bbox_other_do_intersect_test.cpp | 5 +++-- .../triangle_3_triangle_3_intersection.cpp | 21 +++++++------------ 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/Intersections_3/test/Intersections_3/bbox_other_do_intersect_test.cpp b/Intersections_3/test/Intersections_3/bbox_other_do_intersect_test.cpp index 64e2042b7fd..8d2574c0584 100644 --- a/Intersections_3/test/Intersections_3/bbox_other_do_intersect_test.cpp +++ b/Intersections_3/test/Intersections_3/bbox_other_do_intersect_test.cpp @@ -678,10 +678,11 @@ int main() std::cout << std::endl << "Testing with Simple_cartesian..." << std::endl ; b &= test_kernel >(true); - + +#ifdef CGAL_USE_GMP std::cout << std::endl << "Testing with Simple_cartesian..." << std::endl ; b &= test_kernel >(true); - +#endif std::cout << std::endl << "Testing with Cartesian..." << std::endl ; b &= test_kernel >(false); diff --git a/Intersections_3/test/Intersections_3/triangle_3_triangle_3_intersection.cpp b/Intersections_3/test/Intersections_3/triangle_3_triangle_3_intersection.cpp index 2e576c43233..9e45a29a493 100644 --- a/Intersections_3/test/Intersections_3/triangle_3_triangle_3_intersection.cpp +++ b/Intersections_3/test/Intersections_3/triangle_3_triangle_3_intersection.cpp @@ -1,18 +1,13 @@ #include -#ifdef CGAL_USE_GMP -#include -typedef CGAL::Gmpq NT; -#else -#include -#include -typedef CGAL::Quotient NT; -#endif +#include -typedef CGAL::Cartesian Kernel; -typedef Kernel::Triangle_3 Triangle; -typedef Kernel::Point_3 Point; -typedef Kernel::Segment_3 Segment; -typedef std::vector Polygon2; +// leda_rational, or Gmpq, or Quotient +typedef CGAL::Arithmetic_kernel::Rational NT; +typedef CGAL::Cartesian Kernel; +typedef Kernel::Triangle_3 Triangle; +typedef Kernel::Point_3 Point; +typedef Kernel::Segment_3 Segment; +typedef std::vector Polygon2; void test_coplanar_triangles(){ CGAL::Object obj;