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

fix compilation issue

This commit is contained in:
Sébastien Loriot 2015-07-09 08:07:49 +02:00
parent 5d5b60d130
commit a2c1f72164
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Cylinder.h
View File

@ -141,7 +141,7 @@ namespace CGAL {
m_point_on_axis = this->transl(p1, this->scale(xDir, m_radius)); m_point_on_axis = this->transl(p1, this->scale(xDir, m_radius));
m_radius = CGAL::abs(m_radius); m_radius = CGAL::abs(m_radius);
m_axis = m_traits.construct_line_3_object()(m_point_on_axis, axis); m_axis = this->m_traits.construct_line_3_object()(m_point_on_axis, axis);
if (squared_distance(p1) > this->m_epsilon || if (squared_distance(p1) > this->m_epsilon ||
(cos_to_normal(p1, n1) < this->m_normal_threshold)) (cos_to_normal(p1, n1) < this->m_normal_threshold))

25
Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Efficient_RANSAC_fake_traits_for_testing.h
View File

@ -93,28 +93,27 @@ namespace CGAL {
self& operator--() { return *this; } self& operator--() { return *this; }
self operator--(int) { return *this; } self operator--(int) { return *this; }
self& operator+=(difference_type i) { return *this; } self& operator+=(difference_type) { return *this; }
self& operator-=(difference_type i) { return *this; } self& operator-=(difference_type) { return *this; }
self operator+(difference_type i) const { return *this; } self operator+(difference_type) const { return *this; }
self operator-(difference_type i) const { return *this; } self operator-(difference_type) const { return *this; }
difference_type operator-(self x) const { return 0; } difference_type operator-(self ) const { return 0; }
value_type operator*() const { return value_type(); } value_type operator*() const { return value_type(); }
value_type operator[](difference_type i) const { return value_type(); } value_type operator[](difference_type ) const { return value_type(); }
bool operator==(const self& x) const { return true; } bool operator==(const self& ) const { return true; }
bool operator!=(const self& x) const { return true; } bool operator!=(const self& ) const { return true; }
bool operator<(const self& x) const { return true; } bool operator<(const self& ) const { return true; }
}; };
struct Construct_cartesian_const_iterator_d{ struct Construct_cartesian_const_iterator_d{
typedef typename Point_3 Point_d; typedef Point_3 Point_d;
typedef typename Cartesian_const_iterator_d Cartesian_const_iterator_d;
typedef Cartesian_const_iterator_d result_type; typedef Cartesian_const_iterator_d result_type;
Cartesian_const_iterator_d operator()(Point_d const& p) const { return Cartesian_const_iterator_d(); } Cartesian_const_iterator_d operator()(Point_d const& ) const { return Cartesian_const_iterator_d(); }
Cartesian_const_iterator_d operator()(Point_d const& p, int) const { return Cartesian_const_iterator_d(); } Cartesian_const_iterator_d operator()(Point_d const& , int) const { return Cartesian_const_iterator_d(); }
}; };
struct Iso_box_d{}; struct Iso_box_d{};
struct Sphere_d{}; struct Sphere_d{};