From 1b31e34cbe99feb6e00afee8fa4ab067ac5e7bfd Mon Sep 17 00:00:00 2001 From: Marc Glisse Date: Fri, 2 May 2014 16:39:14 +0200 Subject: [PATCH] Order of parameters for std::binary_function. --- NewKernel_d/include/CGAL/NewKernel_d/Types/Sphere.h | 2 +- .../include/CGAL/NewKernel_d/function_objects_cartesian.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NewKernel_d/include/CGAL/NewKernel_d/Types/Sphere.h b/NewKernel_d/include/CGAL/NewKernel_d/Types/Sphere.h index f8873666621..1ed3a658b54 100644 --- a/NewKernel_d/include/CGAL/NewKernel_d/Types/Sphere.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Types/Sphere.h @@ -106,7 +106,7 @@ template struct Point_of_sphere : private Store_kernel { typedef Point result_type; typedef Sphere first_argument_type; typedef int second_argument_type; - struct Trans : std::binary_function { + struct Trans : std::binary_function { FT const& r_; int idx; bool sgn; Trans (int n, FT const& r, bool b) : r_(r), idx(n), sgn(b) {} FT operator()(FT const&x, int i)const{ diff --git a/NewKernel_d/include/CGAL/NewKernel_d/function_objects_cartesian.h b/NewKernel_d/include/CGAL/NewKernel_d/function_objects_cartesian.h index d7cc4104075..2b64136b5f8 100644 --- a/NewKernel_d/include/CGAL/NewKernel_d/function_objects_cartesian.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/function_objects_cartesian.h @@ -796,7 +796,7 @@ template struct Midpoint : private Store_kernel { typedef Point first_argument_type; typedef Point second_argument_type; // There is a division, but it will be cast to RT afterwards anyway, so maybe we could use RT. - struct Average : std::binary_function { + struct Average : std::binary_function { FT operator()(FT const&a, RT const&b)const{ return (a+b)/2; }