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

Fixed includes and typedefs in Weighted_point_23

This commit is contained in:
Mael Rouxel-Labbé 2017-04-06 12:20:40 +02:00
parent 2d2e675dac
commit aacf8db95f
5 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Cartesian_kernel/include/CGAL/Cartesian/Weighted_point_2.h
View File

@ -26,18 +26,23 @@
#ifndef CGAL_CARTESIAN_WEIGHTED_POINT_2_H #ifndef CGAL_CARTESIAN_WEIGHTED_POINT_2_H
#define CGAL_CARTESIAN_WEIGHTED_POINT_2_H #define CGAL_CARTESIAN_WEIGHTED_POINT_2_H
#include <iostream> #include <CGAL/Handle_for.h>
#include <CGAL/Origin.h>
#include <boost/tuple/tuple.hpp> #include <boost/tuple/tuple.hpp>
#include <iostream>
namespace CGAL { namespace CGAL {
template < class R_ > template < class R_ >
class Weighted_pointC2 class Weighted_pointC2
{ {
typedef typename R_::Point_2 Point_2; typedef typename R_::Point_2 Point_2;
typedef typename R_::FT FT; typedef typename R_::FT FT;
typedef typename R_::FT Weight; typedef FT Weight;
typedef boost::tuple<Point_2, Weight> Rep;
typedef boost::tuple<Point_2, Weight> Rep;
typedef typename R_::template Handle<Rep>::type Base; typedef typename R_::template Handle<Rep>::type Base;
Base base; Base base;

14
Cartesian_kernel/include/CGAL/Cartesian/Weighted_point_3.h
View File

@ -26,19 +26,23 @@
#ifndef CGAL_CARTESIAN_WEIGHTED_POINT_3_H #ifndef CGAL_CARTESIAN_WEIGHTED_POINT_3_H
#define CGAL_CARTESIAN_WEIGHTED_POINT_3_H #define CGAL_CARTESIAN_WEIGHTED_POINT_3_H
#include <iostream> #include <CGAL/Handle_for.h>
#include <CGAL/Origin.h>
#include <boost/tuple/tuple.hpp> #include <boost/tuple/tuple.hpp>
#include <iostream>
namespace CGAL { namespace CGAL {
template < class R_ > template < class R_ >
class Weighted_pointC3 class Weighted_pointC3
{ {
typedef typename R_::Point_3 Point_3; typedef typename R_::Point_3 Point_3;
typedef typename R_::FT FT;
typedef FT Weight;
typedef typename R_::FT FT; typedef boost::tuple<Point_3, Weight> Rep;
typedef FT Weight;
typedef boost::tuple<Point_3, Weight> Rep;
typedef typename R_::template Handle<Rep>::type Base; typedef typename R_::template Handle<Rep>::type Base;
Base base; Base base;

20
Homogeneous_kernel/include/CGAL/Homogeneous/Weighted_point_3.h
View File

@ -25,25 +25,23 @@
#ifndef CGAL_HOMOGENEOUS_WEIGHTED_POINT_3_H #ifndef CGAL_HOMOGENEOUS_WEIGHTED_POINT_3_H
#define CGAL_HOMOGENEOUS_WEIGHTED_POINT_3_H #define CGAL_HOMOGENEOUS_WEIGHTED_POINT_3_H
#include <CGAL/Handle_for.h>
#include <CGAL/Origin.h>
#include <boost/tuple/tuple.hpp>
#include <iostream> #include <iostream>
#include <CGAL/Kernel_traits.h>
#include <CGAL/Dimension.h>
#include <boost/utility/enable_if.hpp>
#include <boost/type_traits/is_convertible.hpp>
#include <boost/mpl/and.hpp>
#include <boost/mpl/bool.hpp>
#include <boost/mpl/logical.hpp>
namespace CGAL { namespace CGAL {
template < class R_ > template < class R_ >
class Weighted_pointH3 class Weighted_pointH3
{ {
typedef typename R_::Point_3 Point_3; typedef typename R_::Point_3 Point_3;
typedef typename R_::FT FT;
typedef FT Weight;
typedef typename R_::FT FT; typedef boost::tuple<Point_3, Weight> Rep;
typedef FT Weight;
typedef boost::tuple<Point_3, Weight> Rep;
typedef typename R_::template Handle<Rep>::type Base; typedef typename R_::template Handle<Rep>::type Base;
Base base; Base base;

25
Kernel_23/include/CGAL/Weighted_point_2.h
View File

@ -38,25 +38,24 @@ namespace CGAL {
template <class R_> template <class R_>
class Weighted_point_2 : public R_::Kernel_base::Weighted_point_2 class Weighted_point_2 : public R_::Kernel_base::Weighted_point_2
{ {
typedef typename R_::FT FT; typedef typename R_::FT FT;
typedef typename R_::FT RT; typedef typename R_::FT RT;
typedef Weighted_point_2<R_> Self; typedef Weighted_point_2<R_> Self;
CGAL_static_assertion((boost::is_same<Self, typename R_::Weighted_point_2>::value)); CGAL_static_assertion((boost::is_same<Self, typename R_::Weighted_point_2>::value));
public: public:
typedef Dimension_tag<2> Ambient_dimension;
typedef Dimension_tag<2> Ambient_dimension; typedef Dimension_tag<0> Feature_dimension;
typedef Dimension_tag<0> Feature_dimension;
typedef typename R_::Kernel_base::Weighted_point_2 Rep; typedef typename R_::Kernel_base::Weighted_point_2 Rep;
typedef typename R_::Cartesian_const_iterator_2 Cartesian_const_iterator; typedef typename R_::Cartesian_const_iterator_2 Cartesian_const_iterator;
typedef typename R_::Point_2 Point_2; typedef typename R_::Point_2 Point_2;
typedef typename R_::Vector_2 Vector_2; typedef typename R_::Aff_transformation_2 Aff_transformation_2;
typedef typename R_::Aff_transformation_2 Aff_transformation_2;
typedef Point_2 Point; typedef Point_2 Point;
typedef FT Weight; typedef FT Weight;
typedef R_ R;
const Rep& rep() const const Rep& rep() const
{ {
@ -68,8 +67,6 @@ public:
return *this; return *this;
} }
typedef R_ R;
Weighted_point_2() {} Weighted_point_2() {}
Weighted_point_2(const Origin& o) Weighted_point_2(const Origin& o)

1
Kernel_23/include/CGAL/Weighted_point_3.h
View File

@ -52,7 +52,6 @@ public:
typedef typename R_::Kernel_base::Weighted_point_3 Rep; typedef typename R_::Kernel_base::Weighted_point_3 Rep;
typedef typename R_::Cartesian_const_iterator_3 Cartesian_const_iterator; typedef typename R_::Cartesian_const_iterator_3 Cartesian_const_iterator;
typedef typename R_::Point_3 Point_3; typedef typename R_::Point_3 Point_3;
typedef typename R_::Vector_3 Vector_3;
typedef typename R_::Aff_transformation_3 Aff_transformation_3; typedef typename R_::Aff_transformation_3 Aff_transformation_3;
typedef Point_3 Point; typedef Point_3 Point;