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

fixed warnings with Intersect_3 and result_of

This commit is contained in:
Dmitry Anisimov 2021-02-09 17:30:06 +01:00
parent e2ea93dbc5
commit af3f6dd07f
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Kernel_23/include/CGAL/Kernel/function_objects.h
View File

@ -3292,11 +3292,10 @@ namespace CommonKernelFunctors {
bool operator()(const Sphere_3& s1, const Sphere_3& s2,
const Point_3& a, const Point_3& b) const
{
typedef typename K::Circle_3 Circle_3;
typedef typename K::Point_3 Point_3;
typedef typename K::Segment_3 Segment_3;
typedef typename K::Plane_3 Plane_3;
typedef typename K::Intersect_3 Intersect_3;
typedef typename K::Circle_3 Circle_3;
typedef typename K::Point_3 Point_3;
typedef typename K::Segment_3 Segment_3;
typedef typename K::Plane_3 Plane_3;
const Has_on_bounded_side_3& has_on_bounded_side = *this;

10
STL_Extension/include/CGAL/result_of.h
View File

@ -21,7 +21,11 @@
#include <CGAL/config.h>
#include <CGAL/disable_warnings.h>
#if CGAL_CXX11
#if CGAL_CXX20 || __cpp_lib_is_invocable>=201703L
// C++>=17
#elif CGAL_CXX11
#include <type_traits>
@ -45,7 +49,7 @@
namespace CGAL {
namespace cpp11 {
#if CGAL_CXX20
#if CGAL_CXX20 || __cpp_lib_is_invocable>=201703L
template<typename Signature> class result_of;
template<typename F, typename... Args>
@ -59,7 +63,7 @@ namespace cpp11 {
using boost::result_of;
#endif
#endif // end C++<11
} // end cpp11
} // end CGAL