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

Fix ambiguous comparisons error with C++20

This commit is contained in:
Laurent Rineau 2020-06-15 17:07:35 +02:00
parent 1d3c8bbbc9
commit 9d16a42257
2 changed files with 41 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Nef_2/include/CGAL/Nef_2/iterator_tools.h
View File

@ -48,6 +48,12 @@ public:
bool operator!=( const Self& i) const { bool operator!=( const Self& i) const {
return !(*this == i); return !(*this == i);
} }
bool operator==( const Iter& i ) const {
return Iter::operator==(i);
}
bool operator!=( const Iter& i) const {
return !(*this == i);
}
Self& operator++() { Self& operator++() {
Move move; Move move;

71
Nef_2/include/CGAL/Nef_polynomial.h
View File

@ -69,6 +69,41 @@ class Nef_polynomial
CGAL_STATIC_THREAD_LOCAL_VARIABLE(NT, R_, 1); CGAL_STATIC_THREAD_LOCAL_VARIABLE(NT, R_, 1);
return R_; return R_;
} }
friend bool operator==(const Nef_polynomial<NT> &a, const Nef_polynomial<NT> &b)
{
return a.polynomial() == b.polynomial();
}
friend bool operator==(const Nef_polynomial<NT> &a, const NT& b)
{
return a.polynomial() == b;
}
friend bool operator==(const Nef_polynomial<NT> &a, int b)
{
return a.polynomial() == b;
}
friend bool operator<(const Nef_polynomial<NT> &a, const Nef_polynomial<NT> &b)
{
return a.polynomial() < b.polynomial();
}
friend bool operator<(const Nef_polynomial<NT> &a, const NT& b)
{
return a.polynomial() < b;
}
friend bool operator<(const Nef_polynomial<NT> &a, int b)
{
return a.polynomial() < b;
}
friend bool operator>(const Nef_polynomial<NT> &a, int b)
{
return a.polynomial() > b;
}
}; };
template <class NT> template <class NT>
@ -85,42 +120,6 @@ Nef_polynomial<NT> operator-(const Nef_polynomial<NT> &a)
return - a.polynomial(); return - a.polynomial();
} }
template <class NT>
inline
bool operator<(const Nef_polynomial<NT> &a, const Nef_polynomial<NT> &b)
{
return a.polynomial() < b.polynomial();
}
template <class NT>
inline
bool operator==(const Nef_polynomial<NT> &a, const Nef_polynomial<NT> &b)
{
return a.polynomial() == b.polynomial();
}
template <class NT>
inline
bool operator==(const Nef_polynomial<NT> &a, int b)
{
return a.polynomial() == b;
}
template <class NT>
inline
bool operator<(const Nef_polynomial<NT> &a, int b)
{
return a.polynomial() < b;
}
template <class NT>
inline
bool operator>(const Nef_polynomial<NT> &a, int b)
{
return a.polynomial() > b;
}
#undef CGAL_double #undef CGAL_double
#undef CGAL_int #undef CGAL_int