diff options
Diffstat (limited to 'boost/geometry/algorithms/detail/is_valid/complement_graph.hpp')
| -rw-r--r-- | boost/geometry/algorithms/detail/is_valid/complement_graph.hpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/boost/geometry/algorithms/detail/is_valid/complement_graph.hpp b/boost/geometry/algorithms/detail/is_valid/complement_graph.hpp index c59139a92e..f08e70242c 100644 --- a/boost/geometry/algorithms/detail/is_valid/complement_graph.hpp +++ b/boost/geometry/algorithms/detail/is_valid/complement_graph.hpp @@ -17,9 +17,9 @@ #include <utility> #include <vector> -#include <boost/assert.hpp> #include <boost/core/addressof.hpp> +#include <boost/geometry/core/assert.hpp> #include <boost/geometry/policies/compare.hpp> @@ -104,12 +104,12 @@ private: , m_parent_id(num_nodes, -1) {} - inline signed_index_type parent_id(vertex_handle v) const + inline signed_size_type parent_id(vertex_handle v) const { return m_parent_id[v->id()]; } - inline void set_parent_id(vertex_handle v, signed_index_type id) + inline void set_parent_id(vertex_handle v, signed_size_type id) { m_parent_id[v->id()] = id; } @@ -125,7 +125,7 @@ private: } private: std::vector<bool> m_visited; - std::vector<signed_index_type> m_parent_id; + std::vector<signed_size_type> m_parent_id; }; @@ -145,7 +145,7 @@ private: = m_neighbors[v->id()].begin(); nit != m_neighbors[v->id()].end(); ++nit) { - if ( static_cast<signed_index_type>((*nit)->id()) != data.parent_id(v) ) + if ( static_cast<signed_size_type>((*nit)->id()) != data.parent_id(v) ) { if ( data.visited(*nit) ) { @@ -153,7 +153,7 @@ private: } else { - data.set_parent_id(*nit, static_cast<signed_index_type>(v->id())); + data.set_parent_id(*nit, static_cast<signed_size_type>(v->id())); stack.push(*nit); } } @@ -173,7 +173,7 @@ public: // inserts a ring vertex in the graph and returns its handle // ring id's are zero-based (so the first interior ring has id 1) - inline vertex_handle add_vertex(signed_index_type id) + inline vertex_handle add_vertex(signed_size_type id) { return m_vertices.insert(vertex(static_cast<std::size_t>(id))).first; } @@ -197,8 +197,8 @@ public: inline void add_edge(vertex_handle v1, vertex_handle v2) { - BOOST_ASSERT( v1 != m_vertices.end() ); - BOOST_ASSERT( v2 != m_vertices.end() ); + BOOST_GEOMETRY_ASSERT( v1 != m_vertices.end() ); + BOOST_GEOMETRY_ASSERT( v2 != m_vertices.end() ); m_neighbors[v1->id()].insert(v2); m_neighbors[v2->id()].insert(v1); } |