songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
----------------------------------------------
This commit is contained in:
Jane Tournois 2015-08-11 17:14:46 +02:00
parent 7974986da1
commit 629983854e
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Homogeneous_kernel/include/CGAL/Homogeneous/Aff_transformationH3.h
View File

@ -731,7 +731,6 @@ cartesian(int i, int j) const
template < class R >
CGAL_KERNEL_INLINE
Aff_transformationH3<R>
_general_transformation_composition(
Aff_transformation_repH3<R> l,

7
Nef_2/include/CGAL/Nef_2/Polynomial.h
View File

@ -108,9 +108,9 @@ template <class NT> Polynomial<NT>
operator - (const Polynomial<NT>&, const Polynomial<NT>&);
template <class NT> Polynomial<NT>
operator * (const Polynomial<NT>&, const Polynomial<NT>&);
template <class NT> inline Polynomial<NT>
template <class NT> Polynomial<NT>
operator / (const Polynomial<NT>&, const Polynomial<NT>&);
template <class NT> inline Polynomial<NT>
template <class NT> Polynomial<NT>
operator % (const Polynomial<NT>&, const Polynomial<NT>&);
template<class NT> CGAL::Sign
@ -1180,7 +1180,6 @@ template <class NT> bool is_finite
{ return CGAL::is_finite(p[0]); }
template <class NT>
inline
Polynomial<NT> operator - (const Polynomial<NT>& p)
{
CGAL_assertion(p.degree()>=0);
@ -1244,7 +1243,7 @@ Polynomial<NT> operator * (const Polynomial<NT>& p1,
return p;
}
template <class NT> inline
template <class NT>
Polynomial<NT> operator / (const Polynomial<NT>& p1,
const Polynomial<NT>& p2)
{

2
Polynomial/include/CGAL/Polynomial/Polynomial_type.h
View File

@ -984,7 +984,7 @@ Polynomial<NT> operator + (const Polynomial<NT>& p) {
return p;
}
template <class NT> inline
template <class NT>
Polynomial<NT> operator - (const Polynomial<NT>& p) {
CGAL_precondition(p.degree()>=0);
Polynomial<NT> res(p.coeffs().begin(),p.coeffs().end());