From 629983854e567ce800267b357d7d33deb3778ad1 Mon Sep 17 00:00:00 2001 From: Jane Tournois Date: Tue, 11 Aug 2015 17:14:46 +0200 Subject: [PATCH] attempt to fix the use of "inline" the warning C4396 happens for these functions on msvc2015 ---------------------------------------------- Compiler Warning (level 2) C4396 Visual Studio 2008 "name" : the inline specifier cannot be used when a friend declaration refers to a specialization of a function template A specialization of a function template cannot specify any of the inline specifiers. The compiler issues warning C4396 and ignores the inline specifier. To correct this error Remove the inline, __inline, or __forceinline specifier from the friend function declaration. ---------------------------------------------- --- .../include/CGAL/Homogeneous/Aff_transformationH3.h | 1 - Nef_2/include/CGAL/Nef_2/Polynomial.h | 7 +++---- Polynomial/include/CGAL/Polynomial/Polynomial_type.h | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/Aff_transformationH3.h b/Homogeneous_kernel/include/CGAL/Homogeneous/Aff_transformationH3.h index 25d5589dc7c..28a25336f26 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/Aff_transformationH3.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/Aff_transformationH3.h @@ -731,7 +731,6 @@ cartesian(int i, int j) const template < class R > -CGAL_KERNEL_INLINE Aff_transformationH3 _general_transformation_composition( Aff_transformation_repH3 l, diff --git a/Nef_2/include/CGAL/Nef_2/Polynomial.h b/Nef_2/include/CGAL/Nef_2/Polynomial.h index a5e805bbadf..95272055865 100644 --- a/Nef_2/include/CGAL/Nef_2/Polynomial.h +++ b/Nef_2/include/CGAL/Nef_2/Polynomial.h @@ -108,9 +108,9 @@ template Polynomial operator - (const Polynomial&, const Polynomial&); template Polynomial operator * (const Polynomial&, const Polynomial&); -template inline Polynomial +template Polynomial operator / (const Polynomial&, const Polynomial&); -template inline Polynomial +template Polynomial operator % (const Polynomial&, const Polynomial&); template CGAL::Sign @@ -1180,7 +1180,6 @@ template bool is_finite { return CGAL::is_finite(p[0]); } template -inline Polynomial operator - (const Polynomial& p) { CGAL_assertion(p.degree()>=0); @@ -1244,7 +1243,7 @@ Polynomial operator * (const Polynomial& p1, return p; } -template inline +template Polynomial operator / (const Polynomial& p1, const Polynomial& p2) { diff --git a/Polynomial/include/CGAL/Polynomial/Polynomial_type.h b/Polynomial/include/CGAL/Polynomial/Polynomial_type.h index 096d679aaa2..5a9090e6a54 100644 --- a/Polynomial/include/CGAL/Polynomial/Polynomial_type.h +++ b/Polynomial/include/CGAL/Polynomial/Polynomial_type.h @@ -984,7 +984,7 @@ Polynomial operator + (const Polynomial& p) { return p; } -template inline +template Polynomial operator - (const Polynomial& p) { CGAL_precondition(p.degree()>=0); Polynomial res(p.coeffs().begin(),p.coeffs().end());