Restore the gcc build

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@232314 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Majnemer 2015-03-15 06:11:24 +00:00
parent bc5ada697f
commit f5cb5de29b

View File

@ -652,6 +652,7 @@ public:
Flags=0x3 };
typedef ImutAVLTree<ImutInfo> TreeTy;
typedef ImutAVLTreeGenericIterator<ImutInfo> Self;
ImutAVLTreeGenericIterator() {}
ImutAVLTreeGenericIterator(const TreeTy *Root) {
@ -692,15 +693,11 @@ public:
}
}
bool operator==(const ImutAVLTreeGenericIterator &x) const {
return stack == x.stack;
}
bool operator==(const Self &x) const { return stack == x.stack; }
bool operator!=(const ImutAVLTreeGenericIterator &x) const {
return !(*this == x);
}
bool operator!=(const Self &x) const { return !operator==(x); }
ImutAVLTreeGenericIterator &operator++() {
Self &operator++() {
assert(!stack.empty());
TreeTy* Current = reinterpret_cast<TreeTy*>(stack.back() & ~Flags);
assert(Current);
@ -726,7 +723,7 @@ public:
return *this;
}
ImutAVLTreeGenericIterator &operator--() {
Self &operator--() {
assert(!stack.empty());
TreeTy* Current = reinterpret_cast<TreeTy*>(stack.back() & ~Flags);
assert(Current);
@ -759,7 +756,7 @@ class ImutAVLTreeInOrderIterator {
public:
typedef ImutAVLTree<ImutInfo> TreeTy;
typedef ImutAVLTreeInOrderIterator<ImutInfo> ImutAVLTreeGenericIterator;
typedef ImutAVLTreeInOrderIterator<ImutInfo> Self;
ImutAVLTreeInOrderIterator(const TreeTy* Root) : InternalItr(Root) {
if (Root)
@ -768,18 +765,14 @@ public:
ImutAVLTreeInOrderIterator() : InternalItr() {}
bool operator==(const ImutAVLTreeGenericIterator &x) const {
return InternalItr == x.InternalItr;
}
bool operator==(const Self &x) const { return InternalItr == x.InternalItr; }
bool operator!=(const ImutAVLTreeGenericIterator &x) const {
return !(*this == x);
}
bool operator!=(const Self &x) const { return !(*this == x); }
TreeTy *operator*() const { return *InternalItr; }
TreeTy *operator->() const { return *InternalItr; }
ImutAVLTreeGenericIterator &operator++() {
Self &operator++() {
do ++InternalItr;
while (!InternalItr.atEnd() &&
InternalItr.getVisitState() != InternalIteratorTy::VisitedLeft);
@ -787,7 +780,7 @@ public:
return *this;
}
ImutAVLTreeGenericIterator &operator--() {
Self &operator--() {
do --InternalItr;
while (!InternalItr.atBeginning() &&
InternalItr.getVisitState() != InternalIteratorTy::VisitedLeft);