diff options
Diffstat (limited to 'boost/geometry/index/predicates.hpp')
| -rw-r--r-- | boost/geometry/index/predicates.hpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/boost/geometry/index/predicates.hpp b/boost/geometry/index/predicates.hpp index 6da0d0ec5d..9adf3fa853 100644 --- a/boost/geometry/index/predicates.hpp +++ b/boost/geometry/index/predicates.hpp @@ -2,7 +2,7 @@ // // Spatial query predicates // -// Copyright (c) 2011-2018 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2022 Adam Wulkiewicz, Lodz, Poland. // // This file was modified by Oracle on 2019-2021. // Modifications copyright (c) 2019-2021 Oracle and/or its affiliates. @@ -15,6 +15,12 @@ #ifndef BOOST_GEOMETRY_INDEX_PREDICATES_HPP #define BOOST_GEOMETRY_INDEX_PREDICATES_HPP +#ifdef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL_PREDICATES +#define BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL_PREDICATES +#endif +#endif + #include <boost/geometry/index/detail/predicates.hpp> #include <boost/geometry/util/tuples.hpp> @@ -212,7 +218,7 @@ overlaps(Geometry const& g) >(g); } -#ifdef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL +#ifdef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL_PREDICATES /*! \brief Generate \c touches() predicate. @@ -240,7 +246,7 @@ touches(Geometry const& g) >(g); } -#endif // BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL +#endif // BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL_PREDICATES /*! \brief Generate \c within() predicate. @@ -294,10 +300,8 @@ std::back_inserter(result)); rt.query(index::intersects(box) && index::satisfies(is_red_o()), std::back_inserter(result)); -#ifndef BOOST_NO_CXX11_LAMBDAS rt.query(index::intersects(box) && index::satisfies([](Value const& v) { return v.is_red(); }), std::back_inserter(result)); -#endif \endverbatim \ingroup predicates @@ -343,7 +347,7 @@ nearest(Geometry const& geometry, std::size_t k) return detail::predicates::nearest<Geometry>(geometry, k); } -#ifdef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL +#ifdef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL_PREDICATES /*! \brief Generate path() predicate. @@ -373,7 +377,7 @@ path(SegmentOrLinestring const& linestring, std::size_t k) return detail::predicates::path<SegmentOrLinestring>(linestring, k); } -#endif // BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL +#endif // BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL_PREDICATES namespace detail { namespace predicates { @@ -417,7 +421,7 @@ operator&&(std::tuple<Preds...> const& t, Pred const& p) std::tuple<Preds...>, Pred >::apply(t, p); } - + }} // namespace detail::predicates }}} // namespace boost::geometry::index |