From cca0a1942faa0ae36582e5314dfbedd75da89248 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Tue, 12 Apr 2022 16:14:39 +0200 Subject: [PATCH] workaround issue with intel compiler Cartesian_kernel/include/CGAL/Cartesian/Line_3.h(38): error: incomplete type is not allowed Point_3 first; ^ --- Cartesian_kernel/include/CGAL/Cartesian/Point_2.h | 2 +- Cartesian_kernel/include/CGAL/Cartesian/Point_3.h | 2 +- Cartesian_kernel/include/CGAL/Cartesian/Vector_2.h | 2 +- Cartesian_kernel/include/CGAL/Cartesian/Vector_3.h | 2 +- Kernel_23/include/CGAL/Point_2.h | 2 +- Kernel_23/include/CGAL/Point_3.h | 2 +- Kernel_23/include/CGAL/Vector_2.h | 2 +- Kernel_23/include/CGAL/Vector_3.h | 2 +- NewKernel_d/include/CGAL/NewKernel_d/Wrapper/Point_d.h | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Point_2.h b/Cartesian_kernel/include/CGAL/Cartesian/Point_2.h index 25c4a1699c3..92a71f42557 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Point_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Point_2.h @@ -51,7 +51,7 @@ public: : base(hx, hy, hw) {} friend void swap(Self& a, Self& b) -#ifdef __cpp_lib_is_swappable +#if !defined(__INTEL_COMPILER) && defined(__cpp_lib_is_swappable) noexcept(std::is_nothrow_swappable_v) #endif { diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Point_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Point_3.h index 9d4dcf2104d..1bd80cdb016 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Point_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Point_3.h @@ -49,7 +49,7 @@ public: : base(x, y, z, w) {} friend void swap(Self& a, Self& b) -#ifdef __cpp_lib_is_swappable +#if !defined(__INTEL_COMPILER) && defined(__cpp_lib_is_swappable) noexcept(std::is_nothrow_swappable_v) #endif { diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Vector_2.h b/Cartesian_kernel/include/CGAL/Cartesian/Vector_2.h index 905d766907f..575df5d0728 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Vector_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Vector_2.h @@ -57,7 +57,7 @@ public: : CGAL::make_array(hx, hy) ) {} friend void swap(Self& a, Self& b) -#ifdef __cpp_lib_is_swappable +#if !defined(__INTEL_COMPILER) && defined(__cpp_lib_is_swappable) noexcept(std::is_nothrow_swappable_v) #endif { diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Vector_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Vector_3.h index 222d73652e3..5b03e8d0fb3 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Vector_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Vector_3.h @@ -72,7 +72,7 @@ public: : CGAL::make_array(x, y, z) ) {} friend void swap(Self& a, Self& b) -#ifdef __cpp_lib_is_swappable +#if !defined(__INTEL_COMPILER) && defined(__cpp_lib_is_swappable) noexcept(std::is_nothrow_swappable_v) #endif { diff --git a/Kernel_23/include/CGAL/Point_2.h b/Kernel_23/include/CGAL/Point_2.h index 297817303ee..2ab906e1604 100644 --- a/Kernel_23/include/CGAL/Point_2.h +++ b/Kernel_23/include/CGAL/Point_2.h @@ -84,7 +84,7 @@ public: {} friend void swap(Self& a, Self& b) -#ifdef __cpp_lib_is_swappable +#if !defined(__INTEL_COMPILER) && defined(__cpp_lib_is_swappable) noexcept(std::is_nothrow_swappable_v) #endif { diff --git a/Kernel_23/include/CGAL/Point_3.h b/Kernel_23/include/CGAL/Point_3.h index 77858d83689..2418b5b813f 100644 --- a/Kernel_23/include/CGAL/Point_3.h +++ b/Kernel_23/include/CGAL/Point_3.h @@ -82,7 +82,7 @@ public: {} friend void swap(Self& a, Self& b) -#ifdef __cpp_lib_is_swappable +#if !defined(__INTEL_COMPILER) && defined(__cpp_lib_is_swappable) noexcept(std::is_nothrow_swappable_v) #endif { diff --git a/Kernel_23/include/CGAL/Vector_2.h b/Kernel_23/include/CGAL/Vector_2.h index bc8e6a72a03..1b9d806469b 100644 --- a/Kernel_23/include/CGAL/Vector_2.h +++ b/Kernel_23/include/CGAL/Vector_2.h @@ -93,7 +93,7 @@ public: : RVector_2(typename R::Construct_vector_2()(Return_base_tag(), x,y,w)) {} friend void swap(Self& a, Self& b) -#ifdef __cpp_lib_is_swappable +#if !defined(__INTEL_COMPILER) && defined(__cpp_lib_is_swappable) noexcept(std::is_nothrow_swappable_v) #endif { diff --git a/Kernel_23/include/CGAL/Vector_3.h b/Kernel_23/include/CGAL/Vector_3.h index 75e071c0a7c..464b8607bdf 100644 --- a/Kernel_23/include/CGAL/Vector_3.h +++ b/Kernel_23/include/CGAL/Vector_3.h @@ -93,7 +93,7 @@ public: : Rep(typename R::Construct_vector_3()(Return_base_tag(), x, y, z, w)) {} friend void swap(Self& a, Self& b) -#ifdef __cpp_lib_is_swappable +#if !defined(__INTEL_COMPILER) && defined(__cpp_lib_is_swappable) noexcept(std::is_nothrow_swappable_v) #endif { diff --git a/NewKernel_d/include/CGAL/NewKernel_d/Wrapper/Point_d.h b/NewKernel_d/include/CGAL/NewKernel_d/Wrapper/Point_d.h index 63dd30f2369..15c004af124 100644 --- a/NewKernel_d/include/CGAL/NewKernel_d/Wrapper/Point_d.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Wrapper/Point_d.h @@ -102,7 +102,7 @@ public: : Rep(CPBase()(std::move(v))) {} friend void swap(Self& a, Self& b) -#ifdef __cpp_lib_is_swappable +#if !defined(__INTEL_COMPILER) && defined(__cpp_lib_is_swappable) noexcept(std::is_nothrow_swappable_v) #endif {