mirror of https://github.com/CGAL/cgal
Replace CGAL::Triple by boost::tuple.
This commit is contained in:
parent
b7c906cf00
commit
c71a0233bb
|
|
@ -24,8 +24,8 @@
|
||||||
#ifndef CGAL_SPHERICAL_KERNEL_CIRCULAR_ARC_3_H
|
#ifndef CGAL_SPHERICAL_KERNEL_CIRCULAR_ARC_3_H
|
||||||
#define CGAL_SPHERICAL_KERNEL_CIRCULAR_ARC_3_H
|
#define CGAL_SPHERICAL_KERNEL_CIRCULAR_ARC_3_H
|
||||||
|
|
||||||
#include <CGAL/utility.h>
|
|
||||||
#include <CGAL/Circular_kernel_3/internal_functions_on_circular_arc_3.h>
|
#include <CGAL/Circular_kernel_3/internal_functions_on_circular_arc_3.h>
|
||||||
|
#include <boost/tuple/tuple.hpp>
|
||||||
|
|
||||||
|
|
||||||
namespace CGAL {
|
namespace CGAL {
|
||||||
|
|
@ -42,7 +42,7 @@ namespace CGAL {
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
typedef Triple<Circle_3, Circular_arc_point_3,
|
typedef boost::tuple<Circle_3, Circular_arc_point_3,
|
||||||
Circular_arc_point_3> Rep;
|
Circular_arc_point_3> Rep;
|
||||||
typedef typename SK::template Handle<Rep>::type Base;
|
typedef typename SK::template Handle<Rep>::type Base;
|
||||||
|
|
||||||
|
|
@ -56,7 +56,7 @@ namespace CGAL {
|
||||||
public:
|
public:
|
||||||
|
|
||||||
const Sphere_3& reference_sphere(){
|
const Sphere_3& reference_sphere(){
|
||||||
return get_ref_sphere(get(base).first);
|
return get_ref_sphere(get(base).get<0>());
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -197,17 +197,17 @@ namespace CGAL {
|
||||||
|
|
||||||
const Circle_3& supporting_circle() const
|
const Circle_3& supporting_circle() const
|
||||||
{
|
{
|
||||||
return get(base).first;
|
return get(base).get<0>();
|
||||||
}
|
}
|
||||||
|
|
||||||
const Circular_arc_point_3& source() const
|
const Circular_arc_point_3& source() const
|
||||||
{
|
{
|
||||||
return get(base).second;
|
return get(base).get<1>();
|
||||||
}
|
}
|
||||||
|
|
||||||
const Circular_arc_point_3& target() const
|
const Circular_arc_point_3& target() const
|
||||||
{
|
{
|
||||||
return get(base).third;
|
return get(base).get<2>();
|
||||||
}
|
}
|
||||||
|
|
||||||
Plane_3 supporting_plane() const {
|
Plane_3 supporting_plane() const {
|
||||||
|
|
|
||||||
|
|
@ -24,8 +24,8 @@
|
||||||
#ifndef CGAL_SPHERICAL_KERNEL_LINE_ARC_3_H
|
#ifndef CGAL_SPHERICAL_KERNEL_LINE_ARC_3_H
|
||||||
#define CGAL_SPHERICAL_KERNEL_LINE_ARC_3_H
|
#define CGAL_SPHERICAL_KERNEL_LINE_ARC_3_H
|
||||||
|
|
||||||
#include <CGAL/utility.h>
|
|
||||||
#include <CGAL/Circular_kernel_3/internal_functions_on_sphere_3.h>
|
#include <CGAL/Circular_kernel_3/internal_functions_on_sphere_3.h>
|
||||||
|
#include <boost/tuple/tuple.hpp>
|
||||||
|
|
||||||
namespace CGAL {
|
namespace CGAL {
|
||||||
namespace CGALi{
|
namespace CGALi{
|
||||||
|
|
@ -40,7 +40,7 @@ namespace CGAL {
|
||||||
typedef typename SK::FT FT;
|
typedef typename SK::FT FT;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
typedef Triple<Line_3, Circular_arc_point_3,
|
typedef boost::tuple<Line_3, Circular_arc_point_3,
|
||||||
Circular_arc_point_3> Rep;
|
Circular_arc_point_3> Rep;
|
||||||
typedef typename SK::template Handle<Rep>::type Base;
|
typedef typename SK::template Handle<Rep>::type Base;
|
||||||
|
|
||||||
|
|
@ -173,17 +173,17 @@ namespace CGAL {
|
||||||
|
|
||||||
const Line_3& supporting_line() const
|
const Line_3& supporting_line() const
|
||||||
{
|
{
|
||||||
return get(base).first;
|
return get(base).get<0>();
|
||||||
}
|
}
|
||||||
|
|
||||||
const Circular_arc_point_3& source() const
|
const Circular_arc_point_3& source() const
|
||||||
{
|
{
|
||||||
return get(base).second;
|
return get(base).get<1>();
|
||||||
}
|
}
|
||||||
|
|
||||||
const Circular_arc_point_3& target() const
|
const Circular_arc_point_3& target() const
|
||||||
{
|
{
|
||||||
return get(base).third;
|
return get(base).get<2>();
|
||||||
}
|
}
|
||||||
|
|
||||||
const Circular_arc_point_3& lower_xyz_extremity() const
|
const Circular_arc_point_3& lower_xyz_extremity() const
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue