From 7d97e802194a0f3c28a0e683275258d9a27fd17d Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Sun, 15 Mar 2015 01:37:01 +0000 Subject: [PATCH] Remove use of reserved identifier The C++ standard reserves all identifiers starting with an underscore followed by an uppercase letter for the implementation for any use. llvm-svn: 232302 --- llvm/include/llvm/Analysis/IntervalIterator.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/llvm/include/llvm/Analysis/IntervalIterator.h b/llvm/include/llvm/Analysis/IntervalIterator.h index 664c187..655ce2d 100644 --- a/llvm/include/llvm/Analysis/IntervalIterator.h +++ b/llvm/include/llvm/Analysis/IntervalIterator.h @@ -94,7 +94,6 @@ class IntervalIterator { bool IOwnMem; // If True, delete intervals when done with them // See file header for conditions of use public: - typedef IntervalIterator _Self; typedef std::forward_iterator_tag iterator_category; IntervalIterator() {} // End iterator, empty stack @@ -126,15 +125,17 @@ public: } } - bool operator==(const _Self &x) const { return IntStack == x.IntStack; } - bool operator!=(const _Self &x) const { return !(*this == x); } + bool operator==(const IntervalIterator &x) const { + return IntStack == x.IntStack; + } + bool operator!=(const IntervalIterator &x) const { return !(*this == x); } const Interval *operator*() const { return IntStack.back().first; } Interval *operator*() { return IntStack.back().first; } const Interval *operator->() const { return operator*(); } Interval *operator->() { return operator*(); } - _Self& operator++() { // Preincrement + IntervalIterator &operator++() { // Preincrement assert(!IntStack.empty() && "Attempting to use interval iterator at end!"); do { // All of the intervals on the stack have been visited. Try visiting @@ -156,8 +157,10 @@ public: return *this; } - _Self operator++(int) { // Postincrement - _Self tmp = *this; ++*this; return tmp; + IntervalIterator operator++(int) { // Postincrement + IntervalIterator tmp = *this; + ++*this; + return tmp; } private: -- 2.7.4