Permalink
Browse files

+ rename vertex() back to get_vertex() to avoid g++ getting confused

  • Loading branch information...
1 parent aee3893 commit 4625e509b464eb75d9875edd0ec9c5c8c6a41bb1 @artemp artemp committed Jul 19, 2012
Showing with 4 additions and 4 deletions.
  1. +2 −2 include/mapnik/geometry.hpp
  2. +1 −1 include/mapnik/util/vertex_iterator.hpp
  3. +1 −1 include/mapnik/vertex_vector.hpp
@@ -123,12 +123,12 @@ class geometry : private::boost::noncopyable
unsigned vertex(double* x, double* y) const
{
- return cont_.vertex(itr_++,x,y);
+ return cont_.get_vertex(itr_++,x,y);
}
unsigned vertex(std::size_t index, double* x, double* y) const
{
- return cont_.vertex(index, x, y);
+ return cont_.get_vertex(index, x, y);
}
void rewind(unsigned ) const
@@ -63,7 +63,7 @@ namespace mapnik { namespace util {
void increment()
{
- boost::get<0>(v_) = vertices_->vertex(pos_++, &boost::get<1>(v_), &boost::get<2>(v_));
+ boost::get<0>(v_) = vertices_->get_vertex(pos_++, &boost::get<1>(v_), &boost::get<2>(v_));
}
bool equal( vertex_iterator const& other) const
@@ -105,7 +105,7 @@ class vertex_vector : private boost::noncopyable
*vertex = y;
++pos_;
}
- unsigned vertex(unsigned pos,coord_type* x,coord_type* y) const
+ unsigned get_vertex(unsigned pos,coord_type* x,coord_type* y) const
{
if (pos >= pos_) return SEG_END;
unsigned block = pos >> block_shift;

0 comments on commit 4625e50

Please sign in to comment.