diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
| commit | 1798c4aeca70ac8d0a243684d6a798fbc65735f8 (patch) | |
| tree | e48e19cb6fa03de18e1c63e1a93371b7ebc4eb56 /dev-cpp/lucene++/files | |
| parent | d87262dd706fec50cd150aab3e93883b6337466d (diff) | |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-cpp/lucene++/files')
| -rw-r--r-- | dev-cpp/lucene++/files/lucene++-3.0.7-boost-1.58.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/dev-cpp/lucene++/files/lucene++-3.0.7-boost-1.58.patch b/dev-cpp/lucene++/files/lucene++-3.0.7-boost-1.58.patch deleted file mode 100644 index 9ff33fd03005..000000000000 --- a/dev-cpp/lucene++/files/lucene++-3.0.7-boost-1.58.patch +++ /dev/null @@ -1,37 +0,0 @@ -commit 1987082cf9278a639d772b4f35a8ae2d34944177 -Author: Václav Slavík <vaclav@slavik.io> -Date: Mon May 4 18:04:46 2015 +0200 - - Fix compilation with Boost 1.58 - - 1.58 introduces strict type checking in boost::get() and while that's - good in theory, the VariantUtils code makes it impractical to use. - Instead, use relaxed_get() to get the old behavior. relaxed_get() didn't - exist in older versions of Boost, so the code must check BOOST_VERSION. - - Fixes #93. - -diff --git a/include/VariantUtils.h b/include/VariantUtils.h -index 1e6c243..5a72e59 100644 ---- a/include/VariantUtils.h -+++ b/include/VariantUtils.h -@@ -8,6 +8,7 @@ - #define VARIANTUTILS_H - - #include <boost/any.hpp> -+#include <boost/version.hpp> - #include "Lucene.h" - #include "MiscUtils.h" - -@@ -22,7 +23,11 @@ public: - - template <typename TYPE, typename VAR> - static TYPE get(VAR var) { -+#if BOOST_VERSION < 105800 - return var.type() == typeid(TYPE) ? boost::get<TYPE>(var) : TYPE(); -+#else -+ return var.type() == typeid(TYPE) ? boost::relaxed_get<TYPE>(var) : TYPE(); -+#endif - } - - template <typename TYPE, typename VAR> |