Rename sieve::sieve_ field to value_.

Author: evoskuil

include/bitcoin/database/impl/primitives/sieve.ipp

@@ -61,20 +61,20 @@ constexpr CLASS::sieve() NOEXCEPT
 
 TEMPLATE
 constexpr CLASS::sieve(type value) NOEXCEPT
-  : sieve_{ value }
+  : value_{ value }
 {
 }
 
 TEMPLATE
 constexpr CLASS::type CLASS::value() const NOEXCEPT
 {
-    return sieve_;
+    return value_;
 }
 
 TEMPLATE
 constexpr CLASS::operator CLASS::type() const NOEXCEPT
 {
-    return sieve_;
+    return value_;
 }
 
 // protected
@@ -98,21 +98,21 @@ constexpr bool CLASS::screened(type fingerprint) const NOEXCEPT
     else
     {
         using namespace system;
-        const auto row = shift_right(sieve_, screen_bits);
+        const auto row = shift_right(value_, screen_bits);
         if (row == limit)
         {
-            if (sieve_ == empty)
+            if (value_ == empty)
                 return false;
 
-            if (sieve_ == saturated)
+            if (value_ == saturated)
                 return true;
         }
 
         // Compare masked fingerprint to sieve, for all masks of screen.
         for (type segment{}; segment <= row; ++segment)
         {
             const auto mask = masks(row, segment);
-            if (bit_and(fingerprint, mask) == bit_and(sieve_, mask))
+            if (bit_and(fingerprint, mask) == bit_and(value_, mask))
                 return true;
         }
 
@@ -131,18 +131,18 @@ constexpr bool CLASS::screen(type fingerprint) NOEXCEPT
     else
     {
         using namespace system;
-        auto row = shift_right(sieve_, screen_bits);
+        auto row = shift_right(value_, screen_bits);
         if (row == limit)
         {
-            if (sieve_ == empty)
+            if (value_ == empty)
             {
                 // Reset empty sentinel (not screened) for first screen.
                 zeroize(row);
             }
             else
             {
                 // Sieve was full, now saturated (all screened).
-                sieve_ = saturated;
+                value_ = saturated;
                 return false;
             }
         }
@@ -164,7 +164,7 @@ constexpr bool CLASS::screen(type fingerprint) NOEXCEPT
         const auto mask = masks(row, row);
 
         // Merge incremented selector, current sieve, and new fingerprint.
-        sieve_ = bit_or
+        value_ = bit_or
         (
             shift_left(row, screen_bits),
             bit_and
@@ -173,7 +173,7 @@ constexpr bool CLASS::screen(type fingerprint) NOEXCEPT
                 bit_or
                 (
                     bit_and(fingerprint, mask),
-                    bit_and(sieve_, bit_not(mask))
+                    bit_and(value_, bit_not(mask))
                 )
             )
         );

include/bitcoin/database/primitives/sieve.hpp

@@ -86,7 +86,7 @@ class sieve
     // Logically sparse, e.g. 16 x 16 = 256 table of uint32_t (1024 bytes).
     // Compressed to one-dimensional 136 element array of uint32_t (544 bytes).
     static constexpr masks_t masks_ = generate_masks();
-    type sieve_;
+    type value_;
 };
 
 } // namespace database