Imported Upstream version 1.58.0upstream/1.58.0

Change-Id: If0072143aa26874812e0db6872e1efb10a3e5e94
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

1 files changed, 9 insertions, 9 deletions

diff --git a/boost/geometry/index/detail/distance_predicates.hpp b/boost/geometry/index/detail/distance_predicates.hpp
index 3e057290a6..9a9371df95 100644
--- a/boost/geometry/index/detail/distance_predicates.hpp
+++ b/boost/geometry/index/detail/distance_predicates.hpp
@@ -3,7 +3,7 @@
 // Spatial index distance predicates, calculators and checkers
 // used in nearest query - specialized for envelopes
 //
-// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2015 Adam Wulkiewicz, Lodz, Poland.
 //
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -104,13 +104,13 @@ struct calculate_distance
 
 // this handles nearest() with default Point parameter, to_nearest() and bounds
 template <typename PointRelation, typename Indexable, typename Tag>
-struct calculate_distance< nearest<PointRelation>, Indexable, Tag >
+struct calculate_distance< predicates::nearest<PointRelation>, Indexable, Tag >
 {
     typedef detail::relation<PointRelation> relation;
     typedef typename relation::value_type point_type;
     typedef typename geometry::default_comparable_distance_result<point_type, Indexable>::type result_type;
 
-    static inline bool apply(nearest<PointRelation> const& p, Indexable const& i, result_type & result)
+    static inline bool apply(predicates::nearest<PointRelation> const& p, Indexable const& i, result_type & result)
     {
         result = geometry::comparable_distance(relation::value(p.point_or_relation), i);
         return true;
@@ -118,12 +118,12 @@ struct calculate_distance< nearest<PointRelation>, Indexable, Tag >
 };
 
 template <typename Point, typename Indexable>
-struct calculate_distance< nearest< to_centroid<Point> >, Indexable, value_tag>
+struct calculate_distance< predicates::nearest< to_centroid<Point> >, Indexable, value_tag>
 {
     typedef Point point_type;
     typedef typename geometry::default_comparable_distance_result<point_type, Indexable>::type result_type;
 
-    static inline bool apply(nearest< to_centroid<Point> > const& p, Indexable const& i, result_type & result)
+    static inline bool apply(predicates::nearest< to_centroid<Point> > const& p, Indexable const& i, result_type & result)
     {
         result = index::detail::comparable_distance_centroid(p.point_or_relation.value, i);
         return true;
@@ -131,12 +131,12 @@ struct calculate_distance< nearest< to_centroid<Point> >, Indexable, value_tag>
 };
 
 template <typename Point, typename Indexable>
-struct calculate_distance< nearest< to_furthest<Point> >, Indexable, value_tag>
+struct calculate_distance< predicates::nearest< to_furthest<Point> >, Indexable, value_tag>
 {
     typedef Point point_type;
     typedef typename geometry::default_comparable_distance_result<point_type, Indexable>::type result_type;
 
-    static inline bool apply(nearest< to_furthest<Point> > const& p, Indexable const& i, result_type & result)
+    static inline bool apply(predicates::nearest< to_furthest<Point> > const& p, Indexable const& i, result_type & result)
     {
         result = index::detail::comparable_distance_far(p.point_or_relation.value, i);
         return true;
@@ -144,13 +144,13 @@ struct calculate_distance< nearest< to_furthest<Point> >, Indexable, value_tag>
 };
 
 template <typename SegmentOrLinestring, typename Indexable, typename Tag>
-struct calculate_distance< path<SegmentOrLinestring>, Indexable, Tag>
+struct calculate_distance< predicates::path<SegmentOrLinestring>, Indexable, Tag>
 {
     typedef typename index::detail::default_path_intersection_distance_type<
         Indexable, SegmentOrLinestring
     >::type result_type;
 
-    static inline bool apply(path<SegmentOrLinestring> const& p, Indexable const& i, result_type & result)
+    static inline bool apply(predicates::path<SegmentOrLinestring> const& p, Indexable const& i, result_type & result)
     {
         return index::detail::path_intersection(i, p.geometry, result);
     }