Fix problems with BitSetVector that makes it not compile under GCC 3.0 and 2.95

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@5745 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/Support/BitSetVector.h b/include/Support/BitSetVector.h
index 67b63dc72918fce3071aaa3f2956627e8230a1d3..e52ca17c6b1f02048e47250dd9d6f41bdaff6c93 100644 (file)
--- a/include/Support/BitSetVector.h
+++ b/include/Support/BitSetVector.h
@@ -194,8 +194,8 @@ public:
     iterator(const iterator& I)
       : currentBit(I.currentBit),currentWord(I.currentWord),bitvec(I.bitvec) { }
     iterator& operator=(const iterator& I) {
-      currentWord == I.currentWord;
-      currentBit == I.currentBit;
+      currentWord = I.currentWord;
+      currentBit = I.currentBit;
       bitvec = I.bitvec;
       return *this;
     }
@@ -203,13 +203,13 @@ public:
     // Increment and decrement operators (pre and post)
     iterator& operator++() {
       if (++currentBit == WORDSIZE)
-        { currentBit = 0; if (currentWord < bitvec->maxSize) ++currentWord; }
+        { currentBit = 0; if (currentWord < bitvec->size()) ++currentWord; }
       return *this;
     }
     iterator& operator--() {
       if (currentBit == 0) {
         currentBit = WORDSIZE-1;
-        currentWord = (currentWord == 0)? bitvec->maxSize : --currentWord;
+        currentWord = (currentWord == 0)? bitvec->size() : --currentWord;
       }
       else
         --currentBit;
@@ -220,7 +220,7 @@ public:
 
     // Dereferencing operators
     reference operator*() {
-      assert(currentWord < bitvec->maxSize &&
+      assert(currentWord < bitvec->size() &&
              "Dereferencing iterator past the end of a BitSetVector");
       return bitvec->getWord(currentWord)[currentBit];
     }
@@ -234,7 +234,7 @@ public:
   protected:
     static iterator begin(BitSetVector& _bitvec) { return iterator(_bitvec); }
     static iterator end(BitSetVector& _bitvec)   { return iterator(0,
-                                                    _bitvec.maxSize, _bitvec); }
+                                                    _bitvec.size(), _bitvec); }
     friend class BitSetVector;
   };
 };

diff --git a/include/llvm/ADT/BitSetVector.h b/include/llvm/ADT/BitSetVector.h
index 67b63dc72918fce3071aaa3f2956627e8230a1d3..e52ca17c6b1f02048e47250dd9d6f41bdaff6c93 100644 (file)
--- a/include/llvm/ADT/BitSetVector.h
+++ b/include/llvm/ADT/BitSetVector.h
@@ -194,8 +194,8 @@ public:
     iterator(const iterator& I)
       : currentBit(I.currentBit),currentWord(I.currentWord),bitvec(I.bitvec) { }
     iterator& operator=(const iterator& I) {
-      currentWord == I.currentWord;
-      currentBit == I.currentBit;
+      currentWord = I.currentWord;
+      currentBit = I.currentBit;
       bitvec = I.bitvec;
       return *this;
     }
@@ -203,13 +203,13 @@ public:
     // Increment and decrement operators (pre and post)
     iterator& operator++() {
       if (++currentBit == WORDSIZE)
-        { currentBit = 0; if (currentWord < bitvec->maxSize) ++currentWord; }
+        { currentBit = 0; if (currentWord < bitvec->size()) ++currentWord; }
       return *this;
     }
     iterator& operator--() {
       if (currentBit == 0) {
         currentBit = WORDSIZE-1;
-        currentWord = (currentWord == 0)? bitvec->maxSize : --currentWord;
+        currentWord = (currentWord == 0)? bitvec->size() : --currentWord;
       }
       else
         --currentBit;
@@ -220,7 +220,7 @@ public:
 
     // Dereferencing operators
     reference operator*() {
-      assert(currentWord < bitvec->maxSize &&
+      assert(currentWord < bitvec->size() &&
              "Dereferencing iterator past the end of a BitSetVector");
       return bitvec->getWord(currentWord)[currentBit];
     }
@@ -234,7 +234,7 @@ public:
   protected:
     static iterator begin(BitSetVector& _bitvec) { return iterator(_bitvec); }
     static iterator end(BitSetVector& _bitvec)   { return iterator(0,
-                                                    _bitvec.maxSize, _bitvec); }
+                                                    _bitvec.size(), _bitvec); }
     friend class BitSetVector;
   };
 };