update boost
This commit is contained in:
@@ -12,6 +12,7 @@
|
||||
|
||||
#include <boost/cstdint.hpp>
|
||||
|
||||
#include <algorithm>
|
||||
#include <cmath>
|
||||
#include <cstring>
|
||||
#include <utility>
|
||||
|
||||
@@ -77,7 +77,7 @@ class voronoi_predicates {
|
||||
}
|
||||
}
|
||||
|
||||
typedef struct orientation_test {
|
||||
struct orientation_test {
|
||||
public:
|
||||
// Represents orientation test result.
|
||||
enum Orientation {
|
||||
@@ -115,7 +115,8 @@ class voronoi_predicates {
|
||||
static_cast<int_x2_type>(point3.y());
|
||||
return eval(robust_cross_product(dx1, dy1, dx2, dy2));
|
||||
}
|
||||
} ot;
|
||||
};
|
||||
typedef orientation_test ot;
|
||||
|
||||
template <typename Point>
|
||||
class point_comparison_predicate {
|
||||
|
||||
@@ -97,12 +97,6 @@ class robust_fpt {
|
||||
relative_error_type re() const { return re_; }
|
||||
relative_error_type ulp() const { return re_; }
|
||||
|
||||
robust_fpt& operator=(const robust_fpt& that) {
|
||||
this->fpv_ = that.fpv_;
|
||||
this->re_ = that.re_;
|
||||
return *this;
|
||||
}
|
||||
|
||||
bool has_pos_value() const {
|
||||
return is_pos(fpv_);
|
||||
}
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
|
||||
http://www.boost.org/LICENSE_1_0.txt).
|
||||
*/
|
||||
#ifndef GTL_GTL_HPP
|
||||
#define GTL_GTL_HPP
|
||||
#ifndef BOOST_POLYGON_GTL_HPP
|
||||
#define BOOST_POLYGON_GTL_HPP
|
||||
|
||||
#ifdef __ICC
|
||||
#pragma warning (push)
|
||||
|
||||
@@ -157,12 +157,12 @@ class voronoi_builder {
|
||||
typedef std::map< key_type, value_type, node_comparer_type > beach_line_type;
|
||||
typedef typename beach_line_type::iterator beach_line_iterator;
|
||||
typedef std::pair<circle_event_type, beach_line_iterator> event_type;
|
||||
typedef struct {
|
||||
struct event_comparison_type {
|
||||
bool operator()(const event_type& lhs, const event_type& rhs) const {
|
||||
return predicate(rhs.first, lhs.first);
|
||||
}
|
||||
event_comparison_predicate predicate;
|
||||
} event_comparison_type;
|
||||
};
|
||||
typedef detail::ordered_queue<event_type, event_comparison_type>
|
||||
circle_event_queue_type;
|
||||
typedef std::pair<point_type, beach_line_iterator> end_point_type;
|
||||
|
||||
@@ -263,7 +263,7 @@ struct voronoi_diagram_traits {
|
||||
typedef voronoi_cell<coordinate_type> cell_type;
|
||||
typedef voronoi_vertex<coordinate_type> vertex_type;
|
||||
typedef voronoi_edge<coordinate_type> edge_type;
|
||||
typedef class {
|
||||
class vertex_equality_predicate_type {
|
||||
public:
|
||||
enum { ULPS = 128 };
|
||||
bool operator()(const vertex_type& v1, const vertex_type& v2) const {
|
||||
@@ -274,7 +274,7 @@ struct voronoi_diagram_traits {
|
||||
}
|
||||
private:
|
||||
typename detail::ulp_comparison<T> ulp_cmp;
|
||||
} vertex_equality_predicate_type;
|
||||
};
|
||||
};
|
||||
|
||||
// Voronoi output data structure.
|
||||
|
||||
Reference in New Issue
Block a user