This commit is contained in:
Marc Glisse 2011-05-12 12:47:30 +00:00
parent b92124727e
commit 76c16e45ee
2 changed files with 4 additions and 1 deletions

View File

@ -55,6 +55,7 @@ struct Cartesian_LA_base_d : public Dimension_base<Dim_>
typedef LA_vector Point; typedef LA_vector Point;
typedef LA_vector Vector; typedef LA_vector Vector;
#if 0
// old way // old way
typedef CartesianDVectorBase::Construct_LA_vector<Self> Construct_point; typedef CartesianDVectorBase::Construct_LA_vector<Self> Construct_point;
typedef CartesianDVectorBase::Construct_LA_vector<Self> Construct_vector; typedef CartesianDVectorBase::Construct_LA_vector<Self> Construct_vector;
@ -65,6 +66,7 @@ struct Cartesian_LA_base_d : public Dimension_base<Dim_>
typedef CartesianDVectorBase::Construct_midpoint<Self> Construct_midpoint; typedef CartesianDVectorBase::Construct_midpoint<Self> Construct_midpoint;
typedef CartesianDVectorBase::Compute_cartesian_coordinate<Self> Compute_cartesian_coordinate; typedef CartesianDVectorBase::Compute_cartesian_coordinate<Self> Compute_cartesian_coordinate;
#endif
// new way // new way
template<class, /* C++ sucks */ int=0> struct Construct { template<class, /* C++ sucks */ int=0> struct Construct {

View File

@ -1,13 +1,14 @@
#ifndef CGAL_KERNELD_SEGMENTD_H #ifndef CGAL_KERNELD_SEGMENTD_H
#define CGAL_KERNELD_SEGMENTD_H #define CGAL_KERNELD_SEGMENTD_H
#include <utility> #include <utility>
#include <CGAL/functor_tags.h>
#define Segmentd SegmentCd #define Segmentd SegmentCd
namespace CGAL { namespace CGAL {
template <class R_> class Segmentd { template <class R_> class Segmentd {
typedef typename R_::FT FT_; typedef typename R_::FT FT_;
typedef typename R_::Point Point_; typedef typename R_::Point Point_;
typedef typename R_::Vector Vector_; typedef typename R_::Vector Vector_;
typedef typename R_::Construct_vector Cv_; typedef typename R_::template Construct<Construct_vector_tag>::type Cv_;
// typedef typename R_::Compute_squared_distance Csd_; // typedef typename R_::Compute_squared_distance Csd_;
typedef std::pair<Point_,Point_> Data_; typedef std::pair<Point_,Point_> Data_;
Data_ data; Data_ data;