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

Order of parameters for std::binary_function.

This commit is contained in:
Marc Glisse 2014-05-02 16:39:14 +02:00
parent dda84d067b
commit 1b31e34cbe
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NewKernel_d/include/CGAL/NewKernel_d/Types/Sphere.h
View File

@ -106,7 +106,7 @@ template<class R_> struct Point_of_sphere : private Store_kernel<R_> {
typedef Point result_type; typedef Point result_type;
typedef Sphere first_argument_type; typedef Sphere first_argument_type;
typedef int second_argument_type; typedef int second_argument_type;
struct Trans : std::binary_function<FT,FT,int> { struct Trans : std::binary_function<FT,int,FT> {
FT const& r_; int idx; bool sgn; FT const& r_; int idx; bool sgn;
Trans (int n, FT const& r, bool b) : r_(r), idx(n), sgn(b) {} Trans (int n, FT const& r, bool b) : r_(r), idx(n), sgn(b) {}
FT operator()(FT const&x, int i)const{ FT operator()(FT const&x, int i)const{

2
NewKernel_d/include/CGAL/NewKernel_d/function_objects_cartesian.h
View File

@ -796,7 +796,7 @@ template<class R_> struct Midpoint : private Store_kernel<R_> {
typedef Point first_argument_type; typedef Point first_argument_type;
typedef Point second_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. // There is a division, but it will be cast to RT afterwards anyway, so maybe we could use RT.
struct Average : std::binary_function<FT,FT,RT> { struct Average : std::binary_function<FT,RT,FT> {
FT operator()(FT const&a, RT const&b)const{ FT operator()(FT const&a, RT const&b)const{
return (a+b)/2; return (a+b)/2;
} }