BitSet: Partial fix for Boost 1.90

Author: sgn

include/lucene++/BitSet.h

@@ -24,7 +24,7 @@ class LPPAPI BitSet : public LuceneObject {
     bitset_type bitSet;
 
 public:
-    const uint64_t* getBits();
+    const bitset_type& getBits();
     void clear();
     void clear(uint32_t bitIndex);
     void fastClear(uint32_t bitIndex);

src/core/util/BitSet.cpp

@@ -7,6 +7,8 @@
 #include "LuceneInc.h"
 #include "BitSet.h"
 #include "BitUtil.h"
+#include <boost/version.hpp>
+#include <boost/iterator/function_output_iterator.hpp>
 
 namespace Lucene {
 
@@ -16,9 +18,15 @@ BitSet::BitSet(uint32_t size) : bitSet(size) {
 BitSet::~BitSet() {
 }
 
+#if BOOST_VERSION < 108900
 const uint64_t* BitSet::getBits() {
     return bitSet.empty() ? NULL : static_cast<const uint64_t*>(&bitSet.m_bits[0]);
 }
+#else
+const BitSet::bitset_type& BitSet::getBits() {
+    return bitSet;
+}
+#endif
 
 void BitSet::clear() {
     bitSet.clear();
@@ -151,16 +159,32 @@ int32_t BitSet::nextSetBit(uint32_t fromIndex) const {
 }
 
 void BitSet::_and(const BitSetPtr& set) {
+#if BOOST_VERSION >= 108900
+    bitset_type other = set->bitSet;
+    other.resize(bitSet.size());
+    bitSet &= other;
+#else
     bitset_type::size_type minBlocks = std::min(bitSet.num_blocks(), set->bitSet.num_blocks());
     for (bitset_type::size_type i = 0; i < minBlocks; ++i) {
         bitSet.m_bits[i] &= set->bitSet.m_bits[i];
     }
     if (bitSet.num_blocks() > minBlocks) {
         std::fill(bitSet.m_bits.begin() + minBlocks, bitSet.m_bits.end(), bitset_type::block_type(0));
     }
+#endif
 }
 
 void BitSet::_or(const BitSetPtr& set) {
+#if BOOST_VERSION >= 108900
+    if (set->bitSet.size() > bitSet.size()) {
+        resize(set->bitSet.size());
+        bitSet |= set->bitSet;
+    } else {
+        bitset_type other = set->bitSet;
+        other.resize(bitSet.size());
+        bitSet |= other;
+    }
+#else
     bitset_type::size_type minBlocks = std::min(bitSet.num_blocks(), set->bitSet.num_blocks());
     if (set->bitSet.size() > bitSet.size()) {
         resize(set->bitSet.size());
@@ -171,9 +195,20 @@ void BitSet::_or(const BitSetPtr& set) {
     if (bitSet.num_blocks() > minBlocks) {
         std::copy(set->bitSet.m_bits.begin() + minBlocks, set->bitSet.m_bits.end(), bitSet.m_bits.begin() + minBlocks);
     }
+#endif
 }
 
 void BitSet::_xor(const BitSetPtr& set) {
+#if BOOST_VERSION >= 108900
+    if (set->bitSet.size() > bitSet.size()) {
+        resize(set->bitSet.size());
+        bitSet ^= set->bitSet;
+    } else {
+        bitset_type other = set->bitSet;
+        other.resize(bitSet.size());
+        bitSet ^= other;
+    }
+#else
     bitset_type::size_type minBlocks = std::min(bitSet.num_blocks(), set->bitSet.num_blocks());
     if (set->bitSet.size() > bitSet.size()) {
         resize(set->bitSet.size());
@@ -184,24 +219,38 @@ void BitSet::_xor(const BitSetPtr& set) {
     if (bitSet.num_blocks() > minBlocks) {
         std::copy(set->bitSet.m_bits.begin() + minBlocks, set->bitSet.m_bits.end(), bitSet.m_bits.begin() + minBlocks);
     }
+#endif
 }
 
 void BitSet::andNot(const BitSetPtr& set) {
+#if BOOST_VERSION >= 108900
+    bitset_type other = set->bitSet;
+    other.resize(bitSet.size());
+    bitSet &= other.flip();
+#else
     bitset_type::size_type minBlocks = std::min(bitSet.num_blocks(), set->bitSet.num_blocks());
     for (bitset_type::size_type i = 0; i < minBlocks; ++i) {
         bitSet.m_bits[i] &= ~set->bitSet.m_bits[i];
     }
+#endif
 }
 
 bool BitSet::intersectsBitSet(const BitSetPtr& set) const {
     return bitSet.intersects(set->bitSet);
 }
 
 uint32_t BitSet::cardinality() {
+#if BOOST_VERSION >= 108900
+    return bitSet.count();
+#else
     return bitSet.num_blocks() == 0 ? 0 : (uint32_t)BitUtil::pop_array((int64_t*)getBits(), 0, bitSet.num_blocks());
+#endif
 }
 
 void BitSet::resize(uint32_t size) {
+#if BOOST_VERSION >= 108900
+    bitSet.resize(size);
+#else
     bitset_type::size_type old_num_blocks = bitSet.num_blocks();
     bitset_type::size_type required_blocks = bitSet.calc_num_blocks(size);
     if (required_blocks != old_num_blocks) {
@@ -212,6 +261,7 @@ void BitSet::resize(uint32_t size) {
     if (extra_bits != 0) {
         bitSet.m_bits.back() &= ~(~static_cast<bitset_type::block_type>(0) << extra_bits);
     }
+#endif
 }
 
 bool BitSet::equals(const LuceneObjectPtr& other) {
@@ -224,6 +274,18 @@ bool BitSet::equals(const LuceneObjectPtr& other) {
     }
     BitSetPtr first = bitSet.num_blocks() < otherBitSet->bitSet.num_blocks() ? otherBitSet : shared_from_this();
     BitSetPtr second = bitSet.num_blocks() < otherBitSet->bitSet.num_blocks() ? shared_from_this() : otherBitSet;
+#if BOOST_VERSION >= 108900
+    bitset_type::size_type f = first->bitSet.find_first();
+    bitset_type::size_type s = second->bitSet.find_first();
+    while (f == s) {
+        if (f == bitset_type::npos) {
+            return true;
+        }
+        f = first->bitSet.find_next(f);
+        s = second->bitSet.find_next(f);
+    }
+    return false;
+#else
     bitset_type::size_type firstLength = first->bitSet.num_blocks();
     bitset_type::size_type secondLength = second->bitSet.num_blocks();
     for (bitset_type::size_type i = secondLength; i < firstLength; ++i) {
@@ -237,18 +299,28 @@ bool BitSet::equals(const LuceneObjectPtr& other) {
         }
     }
     return true;
+#endif
 }
 
 int32_t BitSet::hashCode() {
     // Start with a zero hash and use a mix that results in zero if the input is zero.
     // This effectively truncates trailing zeros without an explicit check.
     int64_t hash = 0;
+#if BOOST_VERSION >= 108900
+    to_block_range(bitSet, boost::make_function_output_iterator(
+        [&hash](bitset_type::block_type block) {
+            hash ^= block;
+            hash = (hash << 1) | (hash >> 63); // rotate left
+        }
+    ));
+#else
     uint32_t maxSize = bitSet.num_blocks();
     const uint64_t* bits = getBits();
     for (uint32_t bit = 0; bit < maxSize; ++bit) {
         hash ^= bits[bit];
         hash = (hash << 1) | (hash >> 63); // rotate left
     }
+#endif
     // Fold leftmost bits into right and add a constant to prevent empty sets from
     // returning 0, which is too common.
     return (int32_t)((hash >> 32) ^ hash) + 0x98761234;