Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r56344 - in sandbox/gtl/boost/polygon: . detail
From: lucanus.j.simonson_at_[hidden]
Date: 2009-09-21 15:47:19


Author: ljsimons
Date: 2009-09-21 15:47:18 EDT (Mon, 21 Sep 2009)
New Revision: 56344
URL: http://svn.boost.org/trac/boost/changeset/56344

Log:
updating with minor changes
Text files modified:
   sandbox/gtl/boost/polygon/detail/boolean_op_45.hpp | 2 +-
   sandbox/gtl/boost/polygon/detail/polygon_arbitrary_formation.hpp | 4 ++--
   sandbox/gtl/boost/polygon/detail/scan_arbitrary.hpp | 4 ++--
   sandbox/gtl/boost/polygon/interval_concept.hpp | 17 +++++++++--------
   sandbox/gtl/boost/polygon/point_concept.hpp | 8 +++++++-
   5 files changed, 21 insertions(+), 14 deletions(-)

Modified: sandbox/gtl/boost/polygon/detail/boolean_op_45.hpp
==============================================================================
--- sandbox/gtl/boost/polygon/detail/boolean_op_45.hpp (original)
+++ sandbox/gtl/boost/polygon/detail/boolean_op_45.hpp 2009-09-21 15:47:18 EDT (Mon, 21 Sep 2009)
@@ -260,7 +260,7 @@
       inline Vertex45T(const Vertex45T& vertex) : pt(vertex.pt), rise(vertex.rise), count(vertex.count) {}
       inline Vertex45T& operator=(const Vertex45T& vertex){
         pt = vertex.pt; rise = vertex.rise; count = vertex.count; return *this; }
- inline Vertex45T(const std::pair<Point, Point>& vertex) {}
+ inline Vertex45T(const std::pair<Point, Point>& vertex) : pt(), rise(), count() {}
       inline Vertex45T& operator=(const std::pair<Point, Point>& vertex){ return *this; }
       inline bool operator==(const Vertex45T& vertex) const {
         return pt == vertex.pt && rise == vertex.rise && count == vertex.count; }

Modified: sandbox/gtl/boost/polygon/detail/polygon_arbitrary_formation.hpp
==============================================================================
--- sandbox/gtl/boost/polygon/detail/polygon_arbitrary_formation.hpp (original)
+++ sandbox/gtl/boost/polygon/detail/polygon_arbitrary_formation.hpp 2009-09-21 15:47:18 EDT (Mon, 21 Sep 2009)
@@ -476,12 +476,12 @@
       Point pt;
       Point other_pt; // 1, 0 or -1
       int count; //dxdydTheta
- inline vertex_half_edge() {}
+ inline vertex_half_edge() : pt(), other_pt(), count() {}
       inline vertex_half_edge(const Point& point, const Point& other_point, int countIn) : pt(point), other_pt(other_point), count(countIn) {}
       inline vertex_half_edge(const vertex_half_edge& vertex) : pt(vertex.pt), other_pt(vertex.other_pt), count(vertex.count) {}
       inline vertex_half_edge& operator=(const vertex_half_edge& vertex){
         pt = vertex.pt; other_pt = vertex.other_pt; count = vertex.count; return *this; }
- inline vertex_half_edge(const std::pair<Point, Point>& vertex) {}
+ inline vertex_half_edge(const std::pair<Point, Point>& vertex) : pt(), other_pt(), count() {}
       inline vertex_half_edge& operator=(const std::pair<Point, Point>& vertex){ return *this; }
       inline bool operator==(const vertex_half_edge& vertex) const {
         return pt == vertex.pt && other_pt == vertex.other_pt && count == vertex.count; }

Modified: sandbox/gtl/boost/polygon/detail/scan_arbitrary.hpp
==============================================================================
--- sandbox/gtl/boost/polygon/detail/scan_arbitrary.hpp (original)
+++ sandbox/gtl/boost/polygon/detail/scan_arbitrary.hpp 2009-09-21 15:47:18 EDT (Mon, 21 Sep 2009)
@@ -39,11 +39,11 @@
     std::vector<std::pair<half_edge, int> > event_edges_;
     std::set<Point> intersection_queue_;
   public:
- inline line_intersection() : vertical_data_(), edge_scanline_(), x_((std::numeric_limits<Unit>::max)()), just_before_(0), segment_id_(0) {
+ inline line_intersection() : vertical_data_(), edge_scanline_(), x_((std::numeric_limits<Unit>::max)()), just_before_(0), segment_id_(0), event_edges_(), intersection_queue_() {
       less_half_edge lessElm(&x_, &just_before_);
       edge_scanline_ = edge_scanline(lessElm);
     }
- inline line_intersection(const line_intersection& that) : vertical_data_(), edge_scanline_(), x_(), just_before_(), segment_id_() { (*this) = that; }
+ inline line_intersection(const line_intersection& that) : vertical_data_(), edge_scanline_(), x_(), just_before_(), segment_id_(), event_edges_(), intersection_queue_() { (*this) = that; }
     inline line_intersection& operator=(const line_intersection& that) {
       x_ = that.x_;
       just_before_ = that.just_before_;

Modified: sandbox/gtl/boost/polygon/interval_concept.hpp
==============================================================================
--- sandbox/gtl/boost/polygon/interval_concept.hpp (original)
+++ sandbox/gtl/boost/polygon/interval_concept.hpp 2009-09-21 15:47:18 EDT (Mon, 21 Sep 2009)
@@ -154,21 +154,22 @@
   typename enable_if< typename is_interval_concept<typename geometry_concept<interval_type>::type>::type>::type * = 0
   ) { return (high(interval) + low(interval))/2; }
 
+
+ struct y_i_low : gtl_yes {};
+
   // set the low coordinate to v
   template <typename interval_type>
- void
+ typename enable_if<typename gtl_and<y_i_low, typename is_mutable_interval_concept<typename geometry_concept<interval_type>::type>::type>::type, void>::type
   low(interval_type& interval,
- typename interval_traits<interval_type>::coordinate_type v,
- typename enable_if<typename is_mutable_interval_concept<typename geometry_concept<interval_type>::type>::type>::type * = 0
- ) { set(interval, LOW, v); }
+ typename interval_traits<interval_type>::coordinate_type v) { set(interval, LOW, v); }
   
+ struct y_i_high : gtl_yes {};
+
   // set the high coordinate to v
   template <typename interval_type>
- void
+ typename enable_if<typename gtl_and<y_i_high, typename is_mutable_interval_concept<typename geometry_concept<interval_type>::type>::type>::type, void>::type
   high(interval_type& interval,
- typename interval_traits<interval_type>::coordinate_type v,
- typename enable_if<typename is_mutable_interval_concept<typename geometry_concept<interval_type>::type>::type>::type * = 0
- ) { set(interval, HIGH, v); }
+ typename interval_traits<interval_type>::coordinate_type v) { set(interval, HIGH, v); }
   
   // get the magnitude of the interval
   template <typename interval_type>

Modified: sandbox/gtl/boost/polygon/point_concept.hpp
==============================================================================
--- sandbox/gtl/boost/polygon/point_concept.hpp (original)
+++ sandbox/gtl/boost/polygon/point_concept.hpp 2009-09-21 15:47:18 EDT (Mon, 21 Sep 2009)
@@ -263,8 +263,14 @@
     return point;
   }
 
+ struct y_pt_move : gtl_yes {};
+
   template <typename point_type>
- point_type &
+ typename enable_if<
+ typename gtl_and< y_pt_move,
+ typename is_mutable_point_concept<
+ typename geometry_concept<point_type>::type>::type>::type,
+ point_type>::type &
   move(point_type& point, orientation_2d orient,
        typename point_traits<point_type>::coordinate_type displacement,
        typename enable_if<typename is_mutable_point_concept<typename geometry_concept<point_type>::type>::type>::type * = 0


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk