diff --git a/NewKernel_d/include/CGAL/NewKernel_d/Lazy_cartesian.h b/NewKernel_d/include/CGAL/NewKernel_d/Lazy_cartesian.h index 5e0e24254fe..7c3c8e01878 100644 --- a/NewKernel_d/include/CGAL/NewKernel_d/Lazy_cartesian.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Lazy_cartesian.h @@ -109,6 +109,12 @@ template, private EC { + // `default_construct()` is the same as `T{}`. But, this is a + // workaround to a MSVC-2015 bug (fixed in MSVC-2017): its parser + // seemed confused by `T{}` somewhere below. + template + static T default_construct() { return T(); } + // Lazy_rep_0 does not inherit from EC or take a parameter AC. It has different constructors. static_assert(sizeof...(L)>0, "Use Lazy_rep_0 instead"); template friend class Lazy_kernel_base; @@ -138,7 +144,7 @@ class Lazy_rep_XXX : // Currently we construct the vectors, then move them into the tuple. It would be nicer to construct them in their final destination, because eventually we will also have arrays instead of vectors. template Lazy_rep_XXX(Lazy_internal::typelist, const AC& ac, const EC& ec, LLL const&lll, LL const&...ll) : - Lazy_rep(ac(CGAL::approx(ll)...)), EC(ec), l(Lazy_internal::do_extract(T{},lll)...) + Lazy_rep(ac(CGAL::approx(ll)...)), EC(ec), l(Lazy_internal::do_extract(default_construct(),lll)...) { //this->set_depth(std::max({ -1, (int)CGAL::depth(ll)...}) + 1); this->set_depth(1); // FIXME: now that we have ranges, we could actually compute the depth if we cared... diff --git a/Triangulation/test/Triangulation/test_delaunay.cpp b/Triangulation/test/Triangulation/test_delaunay.cpp index bf6b38ff7ab..4c105df3d2f 100644 --- a/Triangulation/test/Triangulation/test_delaunay.cpp +++ b/Triangulation/test/Triangulation/test_delaunay.cpp @@ -10,6 +10,7 @@ int main() #else #include +#include #include #include #include @@ -112,13 +113,21 @@ void test(const int d, const string & type, const int N) template< int D > void go(const int N) { - typedef CGAL::Epick_d > FK; - typedef CGAL::Delaunay_triangulation Triangulation; - test(D, "static", N); + typedef CGAL::Epick_d > KI; + typedef CGAL::Delaunay_triangulation Triangulation; + test(D, "inexact static", N); - typedef CGAL::Epick_d FK_dyn; - typedef CGAL::Delaunay_triangulation Triangulation_dyn; - test(D, "dynamic", N); + typedef CGAL::Epick_d KI_dyn; + typedef CGAL::Delaunay_triangulation Triangulation_dyn; + test(D, "inexact dynamic", N); + + typedef CGAL::Epeck_d > KE; + typedef CGAL::Delaunay_triangulation TriangulationE; + test(D, "exact static", N); + + typedef CGAL::Epeck_d KE_dyn; + typedef CGAL::Delaunay_triangulation TriangulationE_dyn; + test(D, "exact dynamic", N); } int main(int argc, char **argv) diff --git a/Triangulation/test/Triangulation/test_regular.cpp b/Triangulation/test/Triangulation/test_regular.cpp index f124b1ddabf..c044e663f0e 100644 --- a/Triangulation/test/Triangulation/test_regular.cpp +++ b/Triangulation/test/Triangulation/test_regular.cpp @@ -1,4 +1,5 @@ #include +#include #include #include #include @@ -93,13 +94,21 @@ void test(const int d, const string & type, const int N) template< int D > void go(const int N) { - typedef CGAL::Epick_d > FK; - typedef CGAL::Regular_triangulation Triangulation; - test(D, "static", N); + typedef CGAL::Epick_d > KI; + typedef CGAL::Regular_triangulation Triangulation; + test(D, "inexact static", N); - typedef CGAL::Epick_d FK_dyn; - typedef CGAL::Regular_triangulation Triangulation_dyn; - test(D, "dynamic", N); + typedef CGAL::Epick_d KI_dyn; + typedef CGAL::Regular_triangulation Triangulation_dyn; + test(D, "inexact dynamic", N); + + typedef CGAL::Epeck_d > KE; + typedef CGAL::Regular_triangulation TriangulationE; + test(D, "exact static", N); + + typedef CGAL::Epeck_d KE_dyn; + typedef CGAL::Regular_triangulation TriangulationE_dyn; + test(D, "exact dynamic", N); } void test_inserting_points_at_the_same_position()