Skip to content

Commit

Permalink
Just revert patch file completely
Browse files Browse the repository at this point in the history
  • Loading branch information
jwillikers committed Jul 22, 2022
1 parent 904633f commit 904f0ff
Showing 1 changed file with 6 additions and 19 deletions.
25 changes: 6 additions & 19 deletions recipes/boost/all/patches/1.79.0-geometry_no_rtti.patch
Original file line number Diff line number Diff line change
@@ -1,18 +1,5 @@
From 379f0c364a5ef3e6d57021ab815ea603ab3f1178 Mon Sep 17 00:00:00 2001
From: Adam Wulkiewicz <adam.wulkiewicz@gmail.com>
Date: Tue, 19 Jul 2022 22:52:09 +0200
Subject: [PATCH] [index] Fix and improve rtree experimental features

Fix access specifier preventing use of experimental iterators.
Allow more granular control over enabled experimental features.
---
.../geometry/index/distance_predicates.hpp | 12 +++++++++---
include/boost/geometry/index/predicates.hpp | 16 +++++++++++-----
include/boost/geometry/index/rtree.hpp | 18 ++++++++++++++----
3 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/boost/geometry/index/distance_predicates.hpp b/boost/geometry/index/distance_predicates.hpp
index 59b32af4753..00fc663cb38 100644
index 59b32af47..00fc663cb 100644
--- a/boost/geometry/index/distance_predicates.hpp
+++ b/boost/geometry/index/distance_predicates.hpp
@@ -2,7 +2,7 @@
Expand Down Expand Up @@ -56,7 +43,7 @@ index 59b32af4753..00fc663cb38 100644
// distance predicates generators

diff --git a/boost/geometry/index/predicates.hpp b/boost/geometry/index/predicates.hpp
index 6da0d0ec5d0..3678188dcd1 100644
index 6da0d0ec5..3678188dc 100644
--- a/boost/geometry/index/predicates.hpp
+++ b/boost/geometry/index/predicates.hpp
@@ -2,7 +2,7 @@
Expand Down Expand Up @@ -118,7 +105,7 @@ index 6da0d0ec5d0..3678188dcd1 100644
namespace detail { namespace predicates {

diff --git a/boost/geometry/index/rtree.hpp b/boost/geometry/index/rtree.hpp
index af3b6f4ee07..6bb34faf6e9 100644
index af3b6f4ee..6bb34faf6 100644
--- a/boost/geometry/index/rtree.hpp
+++ b/boost/geometry/index/rtree.hpp
@@ -3,7 +3,7 @@
Expand Down Expand Up @@ -147,7 +134,7 @@ index af3b6f4ee07..6bb34faf6e9 100644
#include <boost/geometry/index/detail/serialization.hpp>
#endif

@@ -312,7 +320,7 @@ class rtree
@@ -312,7 +320,7 @@ private:
typedef typename members_holder::allocator_traits_type allocator_traits_type;

friend class detail::rtree::utilities::view<rtree>;
Expand All @@ -156,7 +143,7 @@ index af3b6f4ee07..6bb34faf6e9 100644
friend class detail::rtree::private_view<rtree>;
friend class detail::rtree::const_private_view<rtree>;
#endif
@@ -1184,7 +1192,9 @@ class rtree
@@ -1184,7 +1192,9 @@ private:
detail::rtree::iterators::distance_query_iterator<members_holder, Predicates>
>;

Expand All @@ -166,4 +153,4 @@ index af3b6f4ee07..6bb34faf6e9 100644
+#else
private:
#endif
/*!
/*!

0 comments on commit 904f0ff

Please sign in to comment.