From 45a9116e0a91f8a137bf548fad431d56ac99713d Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Wed, 6 Nov 2002 18:34:40 +0000 Subject: [PATCH] Make maxSize a private variable, add a size() accessor git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@4573 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/Support/BitSetVector.h | 10 ++++++---- include/llvm/ADT/BitSetVector.h | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/include/Support/BitSetVector.h b/include/Support/BitSetVector.h index 0143413b3d4..d7971b1b79b 100644 --- a/include/Support/BitSetVector.h +++ b/include/Support/BitSetVector.h @@ -41,6 +41,7 @@ class BitSetVector { class iterator; std::vector bitsetVec; + unsigned maxSize; static unsigned NumWords(unsigned Size) { return (Size+WORDSIZE-1)/WORDSIZE;} @@ -53,14 +54,15 @@ class BitSetVector { BitSetVector(); // do not implement! public: - unsigned maxSize; - /// /// Constructor: create a set of the maximum size maxSetSize. /// The set is initialized to empty. /// BitSetVector(unsigned maxSetSize) - : bitsetVec(BitSetVector::NumWords(maxSetSize)), maxSize(maxSetSize) { } + : bitsetVec(NumWords(maxSetSize)), maxSize(maxSetSize) { } + + /// size - Return the number of bits tracked by this bit vector... + unsigned size() const { return maxSize; } /// /// Modifier methods: reset, set for entire set, operator[] for one element. @@ -229,7 +231,7 @@ inline std::ostream& operator<< (std::ostream& O, const BitSetVector& bset) inline bool Disjoint(const BitSetVector& set1, const BitSetVector& set2) { - assert(set1.maxSize == set2.maxSize && "Illegal intersection"); + assert(set1.size() == set2.size() && "Illegal intersection"); for (unsigned i = 0; i < set1.bitsetVec.size(); ++i) if ((set1.getWord(i) & set2.getWord(i)).any()) return false; diff --git a/include/llvm/ADT/BitSetVector.h b/include/llvm/ADT/BitSetVector.h index 0143413b3d4..d7971b1b79b 100644 --- a/include/llvm/ADT/BitSetVector.h +++ b/include/llvm/ADT/BitSetVector.h @@ -41,6 +41,7 @@ class BitSetVector { class iterator; std::vector bitsetVec; + unsigned maxSize; static unsigned NumWords(unsigned Size) { return (Size+WORDSIZE-1)/WORDSIZE;} @@ -53,14 +54,15 @@ class BitSetVector { BitSetVector(); // do not implement! public: - unsigned maxSize; - /// /// Constructor: create a set of the maximum size maxSetSize. /// The set is initialized to empty. /// BitSetVector(unsigned maxSetSize) - : bitsetVec(BitSetVector::NumWords(maxSetSize)), maxSize(maxSetSize) { } + : bitsetVec(NumWords(maxSetSize)), maxSize(maxSetSize) { } + + /// size - Return the number of bits tracked by this bit vector... + unsigned size() const { return maxSize; } /// /// Modifier methods: reset, set for entire set, operator[] for one element. @@ -229,7 +231,7 @@ inline std::ostream& operator<< (std::ostream& O, const BitSetVector& bset) inline bool Disjoint(const BitSetVector& set1, const BitSetVector& set2) { - assert(set1.maxSize == set2.maxSize && "Illegal intersection"); + assert(set1.size() == set2.size() && "Illegal intersection"); for (unsigned i = 0; i < set1.bitsetVec.size(); ++i) if ((set1.getWord(i) & set2.getWord(i)).any()) return false;