Restore the gcc build

llvm-svn: 232314

1 files changed, 10 insertions, 17 deletions

diff --git a/llvm/include/llvm/ADT/ImmutableSet.h b/llvm/include/llvm/ADT/ImmutableSet.h
index eee3ff9230f..a7444117b11 100644
--- a/llvm/include/llvm/ADT/ImmutableSet.h
+++ b/llvm/include/llvm/ADT/ImmutableSet.h
@@ -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);