circular kernel 3 result_of to decltype

This commit is contained in:
Dmitry Anisimov 2020-07-22 15:23:09 +02:00
parent 059bc6062d
commit acdf4c6bee
3 changed files with 11 additions and 14 deletions

View File

@ -20,7 +20,6 @@
#include <CGAL/license/Circular_kernel_3.h> #include <CGAL/license/Circular_kernel_3.h>
#include <CGAL/result_of.h>
#include <CGAL/Bbox_3.h> #include <CGAL/Bbox_3.h>
namespace CGAL { namespace CGAL {
@ -117,19 +116,19 @@ namespace CGAL {
: RCircular_arc_3(a) : RCircular_arc_3(a)
{} {}
typename cpp11::result_of<typename R::Construct_circular_source_vertex_3(Circular_arc_3)>::type decltype(auto)
source() const source() const
{ {
return typename R::Construct_circular_source_vertex_3()(*this); return typename R::Construct_circular_source_vertex_3()(*this);
} }
typename cpp11::result_of<typename R::Construct_circular_target_vertex_3(Circular_arc_3)>::type decltype(auto)
target() const target() const
{ {
return typename R::Construct_circular_target_vertex_3()(*this); return typename R::Construct_circular_target_vertex_3()(*this);
} }
typename cpp11::result_of<typename R::Construct_circle_3(Circular_arc_3)>::type decltype(auto)
supporting_circle() const supporting_circle() const
{ {
return typename R::Construct_circle_3()(*this); return typename R::Construct_circle_3()(*this);

View File

@ -20,7 +20,6 @@
#include <CGAL/license/Circular_kernel_3.h> #include <CGAL/license/Circular_kernel_3.h>
#include <CGAL/result_of.h>
#include <CGAL/Bbox_3.h> #include <CGAL/Bbox_3.h>
#include <iostream> #include <iostream>
@ -196,15 +195,15 @@ public:
typename cpp11::result_of<typename R::Compute_circular_x_3(Circular_arc_point_3)>::type decltype(auto)
x() const x() const
{ return typename R::Compute_circular_x_3()(*this);} { return typename R::Compute_circular_x_3()(*this);}
typename cpp11::result_of<typename R::Compute_circular_y_3(Circular_arc_point_3)>::type decltype(auto)
y() const y() const
{ return typename R::Compute_circular_y_3()(*this);} { return typename R::Compute_circular_y_3()(*this);}
typename cpp11::result_of<typename R::Compute_circular_z_3(Circular_arc_point_3)>::type decltype(auto)
z() const z() const
{ return typename R::Compute_circular_z_3()(*this);} { return typename R::Compute_circular_z_3()(*this);}

View File

@ -20,7 +20,6 @@
#include <CGAL/license/Circular_kernel_3.h> #include <CGAL/license/Circular_kernel_3.h>
#include <CGAL/result_of.h>
#include <CGAL/Bbox_3.h> #include <CGAL/Bbox_3.h>
@ -122,31 +121,31 @@ namespace CGAL {
: RLine_arc_3(a) : RLine_arc_3(a)
{} {}
typename cpp11::result_of<typename R::Construct_circular_source_vertex_3(Line_arc_3)>::type decltype(auto)
source() const source() const
{ {
return typename R::Construct_circular_source_vertex_3()(*this); return typename R::Construct_circular_source_vertex_3()(*this);
} }
typename cpp11::result_of<typename R::Construct_circular_target_vertex_3(Line_arc_3)>::type decltype(auto)
target() const target() const
{ {
return typename R::Construct_circular_target_vertex_3()(*this); return typename R::Construct_circular_target_vertex_3()(*this);
} }
typename cpp11::result_of<typename R::Construct_circular_min_vertex_3(Line_arc_3)>::type decltype(auto)
lower_xyz_extremity() const lower_xyz_extremity() const
{ {
return typename R::Construct_circular_min_vertex_3()(*this); return typename R::Construct_circular_min_vertex_3()(*this);
} }
typename cpp11::result_of<typename R::Construct_circular_max_vertex_3(Line_arc_3)>::type decltype(auto)
higher_xyz_extremity() const higher_xyz_extremity() const
{ {
return typename R::Construct_circular_max_vertex_3()(*this); return typename R::Construct_circular_max_vertex_3()(*this);
} }
typename cpp11::result_of<typename R::Construct_line_3(Line_arc_3)>::type decltype(auto)
supporting_line() const supporting_line() const
{ {
return typename R::Construct_line_3()(*this); return typename R::Construct_line_3()(*this);