From fb4898e88136c319d949a88b2dde541de8802623 Mon Sep 17 00:00:00 2001
From: David Majnemer <david.majnemer@gmail.com>
Date: Sun, 15 Mar 2015 07:09:20 +0000
Subject: [PATCH] ImmutableSet: Rename Self to SelfTy to make it more clear it
 is a type

No functional change intended.

llvm-svn: 232317
---
 llvm/include/llvm/ADT/ImmutableSet.h | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/llvm/include/llvm/ADT/ImmutableSet.h b/llvm/include/llvm/ADT/ImmutableSet.h
index a7444117b116..9a7362bfcdff 100644
--- a/llvm/include/llvm/ADT/ImmutableSet.h
+++ b/llvm/include/llvm/ADT/ImmutableSet.h
@@ -652,7 +652,7 @@ public:
                    Flags=0x3 };
 
   typedef ImutAVLTree<ImutInfo> TreeTy;
-  typedef ImutAVLTreeGenericIterator<ImutInfo> Self;
+  typedef ImutAVLTreeGenericIterator<ImutInfo> SelfTy;
 
   ImutAVLTreeGenericIterator() {}
   ImutAVLTreeGenericIterator(const TreeTy *Root) {
@@ -693,11 +693,11 @@ public:
     }
   }
 
-  bool operator==(const Self &x) const { return stack == x.stack; }
+  bool operator==(const SelfTy &x) const { return stack == x.stack; }
 
-  bool operator!=(const Self &x) const { return !operator==(x); }
+  bool operator!=(const SelfTy &x) const { return !operator==(x); }
 
-  Self &operator++() {
+  SelfTy &operator++() {
     assert(!stack.empty());
     TreeTy* Current = reinterpret_cast<TreeTy*>(stack.back() & ~Flags);
     assert(Current);
@@ -723,7 +723,7 @@ public:
     return *this;
   }
 
-  Self &operator--() {
+  SelfTy &operator--() {
     assert(!stack.empty());
     TreeTy* Current = reinterpret_cast<TreeTy*>(stack.back() & ~Flags);
     assert(Current);
@@ -756,7 +756,7 @@ class ImutAVLTreeInOrderIterator {
 
 public:
   typedef ImutAVLTree<ImutInfo> TreeTy;
-  typedef ImutAVLTreeInOrderIterator<ImutInfo> Self;
+  typedef ImutAVLTreeInOrderIterator<ImutInfo> SelfTy;
 
   ImutAVLTreeInOrderIterator(const TreeTy* Root) : InternalItr(Root) {
     if (Root)
@@ -765,14 +765,16 @@ public:
 
   ImutAVLTreeInOrderIterator() : InternalItr() {}
 
-  bool operator==(const Self &x) const { return InternalItr == x.InternalItr; }
+  bool operator==(const SelfTy &x) const {
+    return InternalItr == x.InternalItr;
+  }
 
-  bool operator!=(const Self &x) const { return !(*this == x); }
+  bool operator!=(const SelfTy &x) const { return !(*this == x); }
 
   TreeTy *operator*() const { return *InternalItr; }
   TreeTy *operator->() const { return *InternalItr; }
 
-  Self &operator++() {
+  SelfTy &operator++() {
     do ++InternalItr;
     while (!InternalItr.atEnd() &&
            InternalItr.getVisitState() != InternalIteratorTy::VisitedLeft);
@@ -780,7 +782,7 @@ public:
     return *this;
   }
 
-  Self &operator--() {
+  SelfTy &operator--() {
     do --InternalItr;
     while (!InternalItr.atBeginning() &&
            InternalItr.getVisitState() != InternalIteratorTy::VisitedLeft);