1 files changed, 6 insertions, 85 deletions
diff --git a/boost/geometry/multi/algorithms/within.hpp b/boost/geometry/multi/algorithms/within.hpp
index a3ec7514b7..9fdc5dd39a 100644
--- a/boost/geometry/multi/algorithms/within.hpp
+++ b/boost/geometry/multi/algorithms/within.hpp
@@ -3,6 +3,10 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
+
+// This file was modified by Oracle on 2013, 2014.
+// Modifications copyright (c) 2013, 2014 Oracle and/or its affiliates.
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -11,94 +15,11 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_WITHIN_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_WITHIN_HPP
 
-
-#include <boost/range.hpp>
-
 #include <boost/geometry/algorithms/within.hpp>
-#include <boost/geometry/multi/core/closure.hpp>
-#include <boost/geometry/multi/core/point_order.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-
-namespace boost { namespace geometry
-{
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace within
-{
-
-
-template
-<
-    typename Geometry,
-    typename MultiGeometry,
-    typename Strategy,
-    typename Policy
->
-struct geometry_multi_within_code
-{
-    static inline int apply(Geometry const& geometry,
-            MultiGeometry const& multi,
-            Strategy const& strategy)
-    {
-        for (typename boost::range_iterator<MultiGeometry const>::type it
-                    = boost::begin(multi);
-            it != boost::end(multi);
-            ++it)
-        {
-            // Geometry coding on multi: 1 (within) if within one of them;
-            // 0 (touch) if on border of one of them
-            int const code = Policy::apply(geometry, *it, strategy);
-            if (code != -1)
-            {
-                return code;
-            }
-        }
-        return -1;
-    }
-};
-
-
-}} // namespace detail::within
-#endif // DOXYGEN_NO_DETAIL
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-template <typename Point, typename MultiPolygon>
-struct within<Point, MultiPolygon, point_tag, multi_polygon_tag>
-{
-    template <typename Strategy>
-    static inline bool apply(Point const& point, 
-                MultiPolygon const& multi_polygon, Strategy const& strategy)
-    {
-        return detail::within::geometry_multi_within_code
-            <
-                Point,
-                MultiPolygon,
-                Strategy,
-                detail::within::point_in_polygon
-                        <
-                            Point,
-                            typename boost::range_value<MultiPolygon>::type,
-                            order_as_direction
-                                <
-                                    geometry::point_order<MultiPolygon>::value
-                                >::value,
-                            geometry::closure<MultiPolygon>::value,
-                            Strategy
-                        >
-            >::apply(point, multi_polygon, strategy) == 1;
-    }
-};
-
-} // namespace dispatch
-#endif // DOXYGEN_NO_DISPATCH
-
-}} // namespace boost::geometry
 
 #endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_WITHIN_HPP