forked from conan-io/conan-center-index
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
boost/1.79.0: Add patch to enable building Boost Geometry without RTTI
The patch is taken from a fix applied upstream in Boost Geometry. See boostorg/geometry#1042 for details.
- Loading branch information
1 parent
5bc865a
commit 544209e
Showing
2 changed files
with
158 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
156 changes: 156 additions & 0 deletions
156
recipes/boost/all/patches/1.79.0-geometry_no_rtti.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,156 @@ | ||
diff --git a/boost/geometry/index/distance_predicates.hpp b/boost/geometry/index/distance_predicates.hpp | ||
index 59b32af47..00fc663cb 100644 | ||
--- a/boost/geometry/index/distance_predicates.hpp | ||
+++ b/boost/geometry/index/distance_predicates.hpp | ||
@@ -2,7 +2,7 @@ | ||
// | ||
// Spatial index distance predicates, calculators and checkers used in nearest neighbor query | ||
// | ||
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland. | ||
+// Copyright (c) 2011-2022 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 | ||
@@ -11,6 +11,12 @@ | ||
#ifndef BOOST_GEOMETRY_INDEX_DISTANCE_PREDICATES_HPP | ||
#define BOOST_GEOMETRY_INDEX_DISTANCE_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/distance_predicates.hpp> | ||
|
||
/*! | ||
@@ -21,7 +27,7 @@ namespace boost { namespace geometry { namespace index { | ||
|
||
// relations generators | ||
|
||
-#ifdef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL | ||
+#ifdef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL_PREDICATES | ||
|
||
/*! | ||
\brief Generate to_nearest() relationship. | ||
@@ -91,7 +97,7 @@ detail::to_furthest<T> to_furthest(T const& v) | ||
return detail::to_furthest<T>(v); | ||
} | ||
|
||
-#endif // BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL | ||
+#endif // BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL_PREDICATES | ||
|
||
// distance predicates generators | ||
|
||
diff --git a/boost/geometry/index/predicates.hpp b/boost/geometry/index/predicates.hpp | ||
index 6da0d0ec5..3678188dc 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. | ||
@@ -343,7 +349,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 +379,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 { | ||
|
||
diff --git a/boost/geometry/index/rtree.hpp b/boost/geometry/index/rtree.hpp | ||
index af3b6f4ee..6bb34faf6 100644 | ||
--- a/boost/geometry/index/rtree.hpp | ||
+++ b/boost/geometry/index/rtree.hpp | ||
@@ -3,7 +3,7 @@ | ||
// R-tree implementation | ||
// | ||
// Copyright (c) 2008 Federico J. Fernandez. | ||
-// Copyright (c) 2011-2019 Adam Wulkiewicz, Lodz, Poland. | ||
+// Copyright (c) 2011-2022 Adam Wulkiewicz, Lodz, Poland. | ||
// Copyright (c) 2020 Caian Benedicto, Campinas, Brazil. | ||
// | ||
// This file was modified by Oracle on 2019-2021. | ||
@@ -90,7 +90,15 @@ | ||
#include <boost/geometry/index/detail/rtree/query_iterators.hpp> | ||
|
||
#ifdef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL | ||
-// serialization | ||
+#ifndef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL_SERIALIZATION | ||
+#define BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL_SERIALIZATION | ||
+#endif | ||
+#ifndef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL_ITERATORS | ||
+#define BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL_ITERATORS | ||
+#endif | ||
+#endif | ||
+ | ||
+#ifdef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL_SERIALIZATION | ||
#include <boost/geometry/index/detail/serialization.hpp> | ||
#endif | ||
|
||
@@ -312,7 +320,7 @@ private: | ||
typedef typename members_holder::allocator_traits_type allocator_traits_type; | ||
|
||
friend class detail::rtree::utilities::view<rtree>; | ||
-#ifdef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL | ||
+#ifdef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL_SERIALIZATION | ||
friend class detail::rtree::private_view<rtree>; | ||
friend class detail::rtree::const_private_view<rtree>; | ||
#endif | ||
@@ -1184,7 +1192,9 @@ private: | ||
detail::rtree::iterators::distance_query_iterator<members_holder, Predicates> | ||
>; | ||
|
||
-#ifndef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL | ||
+#ifdef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL_ITERATORS | ||
+public: | ||
+#else | ||
private: | ||
#endif | ||
/*! |