From 72d1f9db27e3b5e20b65b95819acf842c3a11172 Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Tue, 26 Nov 2013 22:36:41 +0000 Subject: [PM] [cleanup] Replace a reserved identifier "_Self" with the injected class name. I think we're no longer using any compilers with sufficiently broken ICN for this use case, but I'll watch the bots and introduce a typedef without a reserved name if any yell at me. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@195793 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/ADT/SCCIterator.h | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/include/llvm/ADT/SCCIterator.h b/include/llvm/ADT/SCCIterator.h index f98cad925c..e6d6b82e79 100644 --- a/include/llvm/ADT/SCCIterator.h +++ b/include/llvm/ADT/SCCIterator.h @@ -145,12 +145,10 @@ class scc_iterator inline scc_iterator() {} public: - typedef scc_iterator _Self; - - static inline _Self begin(const GraphT &G) { - return _Self(GT::getEntryNode(G)); + static inline scc_iterator begin(const GraphT &G) { + return scc_iterator(GT::getEntryNode(G)); } - static inline _Self end(const GraphT &) { return _Self(); } + static inline scc_iterator end(const GraphT &) { return scc_iterator(); } /// \brief Direct loop termination test which is more efficient than /// comparison with \c end(). @@ -159,17 +157,17 @@ public: return CurrentSCC.empty(); } - inline bool operator==(const _Self &x) const { + inline bool operator==(const scc_iterator &x) const { return VisitStack == x.VisitStack && CurrentSCC == x.CurrentSCC; } - inline bool operator!=(const _Self &x) const { return !operator==(x); } + inline bool operator!=(const scc_iterator &x) const { return !operator==(x); } - inline _Self &operator++() { + inline scc_iterator &operator++() { GetNextSCC(); return *this; } - inline _Self operator++(int) { - _Self tmp = *this; + inline scc_iterator operator++(int) { + scc_iterator tmp = *this; ++*this; return tmp; } -- cgit v1.2.3