6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-16 12:24:03 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@5745 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner
2003-03-17 18:11:27 +00:00
parent 760da06489
commit 8fb1fe16b7
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/Support/BitSetVector.h
View File

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

12
include/llvm/ADT/BitSetVector.h
View File

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