Subject: [Boost-commit] svn:boost r74524 - in sandbox-branches/geometry/index/boost/geometry/extensions/index: . rtree/visitors
From: adam.wulkiewicz_at_[hidden]
Date: 2011-09-22 17:51:22
Author: awulkiew
Date: 2011-09-22 17:51:21 EDT (Thu, 22 Sep 2011)
New Revision: 74524
URL: http://svn.boost.org/trac/boost/changeset/74524
Log:
some names changed, namespace error fixed
Text files modified:
sandbox-branches/geometry/index/boost/geometry/extensions/index/distance_calc.hpp | 18 +++++++++---------
sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/visitors/nearest.hpp | 18 +++++++++---------
2 files changed, 18 insertions(+), 18 deletions(-)
Modified: sandbox-branches/geometry/index/boost/geometry/extensions/index/distance_calc.hpp
==============================================================================
--- sandbox-branches/geometry/index/boost/geometry/extensions/index/distance_calc.hpp (original)
+++ sandbox-branches/geometry/index/boost/geometry/extensions/index/distance_calc.hpp 2011-09-22 17:51:21 EDT (Thu, 22 Sep 2011)
@@ -81,21 +81,21 @@
inline detail::distance_unbounded<Point, detail::distance_near_tag>
distance_near(Point const& p)
{
- return detail::detail::distance_unbounded<Point, detail::distance_near_tag>(p);
+ return detail::distance_unbounded<Point, detail::distance_near_tag>(p);
}
template <typename Point>
inline detail::distance_unbounded<Point, detail::distance_far_tag>
distance_far(Point const& p)
{
- return detail::detail::distance_unbounded<Point, detail::distance_far_tag>(p);
+ return detail::distance_unbounded<Point, detail::distance_far_tag>(p);
}
template <typename Point>
inline detail::distance_unbounded<Point, detail::distance_centroid_tag>
distance_centroid(Point const& p)
{
- return detail::detail::distance_unbounded<Point, detail::distance_centroid_tag>(p);
+ return detail::distance_unbounded<Point, detail::distance_centroid_tag>(p);
}
template <typename Point>
@@ -104,7 +104,7 @@
Point const& p,
typename index::traits::coordinate_type<Point>::type const& distance_min)
{
- return detail::detail::distance_half_bounded<Point, detail::distance_near_tag, detail::distance_min_tag>(p, distance_min);
+ return detail::distance_half_bounded<Point, detail::distance_near_tag, detail::distance_min_tag>(p, distance_min);
}
template <typename Point>
@@ -113,7 +113,7 @@
Point const& p,
typename index::traits::coordinate_type<Point>::type const& distance_min)
{
- return detail::detail::distance_half_bounded<Point, detail::distance_far_tag, detail::distance_min_tag>(p, distance_min);
+ return detail::distance_half_bounded<Point, detail::distance_far_tag, detail::distance_min_tag>(p, distance_min);
}
template <typename Point>
@@ -122,7 +122,7 @@
Point const& p,
typename index::traits::coordinate_type<Point>::type const& distance_min)
{
- return detail::detail::distance_half_bounded<Point, detail::distance_centroid_tag, detail::distance_min_tag>(p, distance_min);
+ return detail::distance_half_bounded<Point, detail::distance_centroid_tag, detail::distance_min_tag>(p, distance_min);
}
template <typename Point>
@@ -132,7 +132,7 @@
typename index::traits::coordinate_type<Point>::type const& distance_min,
typename index::traits::coordinate_type<Point>::type const& distance_max)
{
- return detail::detail::distance_bounded<Point, detail::distance_near_tag>(p, distance_min, distance_max);
+ return detail::distance_bounded<Point, detail::distance_near_tag>(p, distance_min, distance_max);
}
template <typename Point>
@@ -142,7 +142,7 @@
typename index::traits::coordinate_type<Point>::type const& distance_min,
typename index::traits::coordinate_type<Point>::type const& distance_max)
{
- return detail::detail::distance_bounded<Point, detail::distance_far_tag>(p, distance_min, distance_max);
+ return detail::distance_bounded<Point, detail::distance_far_tag>(p, distance_min, distance_max);
}
template <typename Point>
@@ -152,7 +152,7 @@
typename index::traits::coordinate_type<Point>::type const& distance_min,
typename index::traits::coordinate_type<Point>::type const& distance_max)
{
- return detail::detail::distance_bounded<Point, detail::distance_centroid_tag>(p, distance_min, distance_max);
+ return detail::distance_bounded<Point, detail::distance_centroid_tag>(p, distance_min, distance_max);
}
// algorithms
Modified: sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/visitors/nearest.hpp
==============================================================================
--- sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/visitors/nearest.hpp (original)
+++ sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/visitors/nearest.hpp 2011-09-22 17:51:21 EDT (Thu, 22 Sep 2011)
@@ -34,37 +34,37 @@
typedef typename geometry::default_distance_result<Point, indexable_type>::type distance_type;
inline nearest_one()
- : comp_dist(std::numeric_limits<distance_type>::max())
+ : m_comp_dist(std::numeric_limits<distance_type>::max())
{}
inline void store(Value const& val, distance_type const& curr_comp_dist)
{
- if ( curr_comp_dist < comp_dist )
+ if ( curr_comp_dist < m_comp_dist )
{
- comp_dist = curr_mindist;
- value = val;
+ m_comp_dist = curr_comp_dist;
+ m_value = val;
}
}
inline bool is_comparable_distance_valid() const
{
- return comp_dist < std::numeric_limits<distance_type>::max();
+ return m_comp_dist < std::numeric_limits<distance_type>::max();
}
inline distance_type comparable_distance() const
{
- return comp_dist;
+ return m_comp_dist;
}
inline size_t get(Value & v)
{
- v = value;
+ v = m_value;
return is_comparable_distance_valid() ? 1 : 0;
}
private:
- Value value;
- distance_type comp_dist;
+ Value m_value;
+ distance_type m_comp_dist;
};
template <typename Value, typename Translator, typename Point>