From 0d1a89ac32d71bfd638e1d15ab2907682b394ea2 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 7 Feb 2020 17:17:44 +0100 Subject: [PATCH] Implement a workaround for MSVC 2015 See the compilation errors at: https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-5.1-Ic-68/Triangulation/TestReport_afabri_x64_Cygwin-Windows10_MSVC2015-Debug-64bits.gz --- NewKernel_d/include/CGAL/NewKernel_d/Lazy_cartesian.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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...