aboutsummaryrefslogtreecommitdiffstats
path: root/Hilbert
diff options
context:
space:
mode:
Diffstat (limited to 'Hilbert')
-rw-r--r--Hilbert/BigBitVec.hpp2
-rw-r--r--Hilbert/FixBitVec.hpp5
2 files changed, 2 insertions, 5 deletions
diff --git a/Hilbert/BigBitVec.hpp b/Hilbert/BigBitVec.hpp
index c90e206..dee7b77 100644
--- a/Hilbert/BigBitVec.hpp
+++ b/Hilbert/BigBitVec.hpp
@@ -597,7 +597,6 @@ public:
iWidth = size();
// Modulo the number of bits.
- //FBVMOD(iBits,iWidth);
assert( iBits < iWidth );
if ( iBits == 0 ) return (*this);
@@ -629,7 +628,6 @@ public:
iWidth = size();
// Modulo the number of bits.
- //FBVMOD(iBits,iWidth);
assert( iBits < iWidth );
if ( iBits == 0 ) return (*this);
diff --git a/Hilbert/FixBitVec.hpp b/Hilbert/FixBitVec.hpp
index 7955e0b..89f7bf6 100644
--- a/Hilbert/FixBitVec.hpp
+++ b/Hilbert/FixBitVec.hpp
@@ -35,7 +35,6 @@ typedef uint64_t FBV_UINT;
#define FBV1 ((FBV_UINT)1)
#define FBV1S (~FBV0)
#define FBVN1S(n) (n==FBV_BITS?FBV1S:(FBV1<<n)-1)
-#define FBVMOD(i,m) if((i)>=(m))(i)-=(m)*((i)/(m));
class CFixBitVec
{
@@ -307,7 +306,7 @@ public:
{
assert( iBits >= 0 );
assert( iWidth > 0 );
- assert( iBits < iWidth );//#D FBVMOD(iBits,iWidth);
+ assert( iBits < iWidth );
m_uiRack &= FBVN1S(iWidth);
m_uiRack = (m_uiRack>>iBits) | (m_uiRack<<(iWidth-iBits));
m_uiRack &= FBVN1S(iWidth);
@@ -323,7 +322,7 @@ public:
{
assert( iBits >= 0 );
assert( iWidth > 0 );
- assert( iBits < iWidth );//#D FBVMOD(iBits,iWidth);
+ assert( iBits < iWidth );
m_uiRack &= FBVN1S(iWidth);
m_uiRack = (m_uiRack<<iBits) | (m_uiRack>>(iWidth-iBits));
m_uiRack &= FBVN1S(iWidth);