From de58505e3871b46507357134400c699fd2019cff Mon Sep 17 00:00:00 2001 From: Daniel Lemire Date: Tue, 23 Aug 2016 14:56:25 -0400 Subject: [PATCH] Fixing a shadow --- include/concise.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/concise.h b/include/concise.h index a051609..6d626b4 100644 --- a/include/concise.h +++ b/include/concise.h @@ -346,24 +346,24 @@ class ConciseSet { } uint32_t size() const { - uint32_t size = 0; + uint32_t cardsize = 0; for (int i = 0; i <= lastWordIndex; i++) { uint32_t w = words[i]; if (isLiteral(w)) { - size += getLiteralBitCount(w); + cardsize += getLiteralBitCount(w); } else { if (isZeroSequence(w)) { if (!isSequenceWithNoBits(w)) - size++; + cardsize++; } else { - size += maxLiteralLengthMultiplication( + cardsize += maxLiteralLengthMultiplication( getSequenceCount(w) + 1); if (!isSequenceWithNoBits(w)) - size--; + cardsize--; } } } - return size; + return cardsize; } static ConciseSet fast_logicalor(size_t n, const ConciseSet **inputs) {