Skip to content

Commit bf3937f

Browse files
committed
Reformat the long list of #ifdef/#else
And display the typeid of the kernel, for checking. (cherry picked from commit 8eb51be) Conflicts: Triangulation_3/benchmark/Triangulation_3/Triangulation_benchmark_3.cpp
1 parent cb09dc9 commit bf3937f

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

Triangulation_3/benchmark/Triangulation_3/Triangulation_benchmark_3.cpp

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -65,29 +65,29 @@ using namespace CGAL;
6565
// - EPEC,
6666
// - or EPIC (the default)
6767
#ifdef SC_DOUBLE
68-
typedef Simple_cartesian<double> K;
68+
typedef Simple_cartesian<double> K;
6969
#elif C_LEDA
70-
#include <CGAL/leda_rational.h>
71-
#include <CGAL/Cartesian.h>
72-
typedef Cartesian<leda_rational> K;
70+
# include <CGAL/leda_rational.h>
71+
# include <CGAL/Cartesian.h>
72+
typedef Cartesian<leda_rational> K;
7373
#elif defined(ONLY_STATIC_FILTERS)
74-
typedef CGAL::internal::Static_filters<CGAL::Simple_cartesian<double> > K;
74+
typedef CGAL::internal::Static_filters<CGAL::Simple_cartesian<double> > K;
7575
#elif defined(EPEC)
7676
# ifdef CGAL_DONT_USE_LAZY_KERNEL
77-
typedef Epeck K;
78-
# else
79-
#ifdef CGAL_USE_LEDA
80-
#include <CGAL/leda_rational.h>
81-
#include <CGAL/Cartesian.h>
82-
typedef Cartesian<leda_rational> SK;
83-
#else
84-
typedef Simple_cartesian<Gmpq> SK;
85-
#endif
86-
typedef Lazy_kernel<SK> K;
87-
# endif
77+
typedef Epeck K;
78+
# else // not CGAL_DONT_USE_LAZY_KERNEL
79+
# ifdef CGAL_USE_LEDA
80+
# include <CGAL/leda_rational.h>
81+
# include <CGAL/Cartesian.h>
82+
typedef Cartesian<leda_rational> SK;
83+
# else // not CGAL_USE_LEDA
84+
typedef Simple_cartesian<Gmpq> SK;
85+
# endif // not CGAL_USE_LEDA
86+
typedef Lazy_kernel<SK> K;
87+
# endif // not CGAL_DONT_USE_LAZY_KERNEL
8888
#else // EPIC
89-
typedef Exact_predicates_inexact_constructions_kernel K;
90-
#endif
89+
typedef Exact_predicates_inexact_constructions_kernel K;
90+
#endif // EPIC
9191
typedef Regular_triangulation_euclidean_traits_3<K> WK;
9292
typedef K::Point_3 Point;
9393

@@ -349,7 +349,7 @@ int main(int argc, char **argv)
349349

350350
cout << "\nProcessor : "
351351
<< ((sizeof(void*)==4) ? 32 : (sizeof(void*)==8) ? 64 : -1) << " bits\n";
352-
// cout << "Kernel : EPICK\n";
352+
cout << "Kernel typeid: " << typeid(K).name() << "\n";
353353

354354
do_benchmarks<DT3>("Delaunay [Compact_location]");
355355
if (input_file_selected)

0 commit comments

Comments
 (0)