From 3c1f8e0054d0f3b0614565388b0f7e2fd65ea60f Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Thu, 24 Apr 2014 06:59:50 +0000 Subject: [PATCH] [ADT] Attempt to appease another MSVC oddity by moving the injected class name usage into a context we can put typename on it. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@207084 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/ADT/iterator.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/include/llvm/ADT/iterator.h b/include/llvm/ADT/iterator.h index e64ae9abb9f..b1d29a88623 100644 --- a/include/llvm/ADT/iterator.h +++ b/include/llvm/ADT/iterator.h @@ -104,6 +104,8 @@ class iterator_adaptor_base : public iterator_facade_base< DerivedT, typename WrappedTraitsT::iterator_category, T, typename WrappedTraitsT::difference_type, PointerT, ReferenceT> { + typedef typename iterator_adaptor_base::iterator_facade_base BaseT; + protected: WrappedIteratorT I; @@ -130,17 +132,17 @@ public: I -= n; return *static_cast(this); } - using iterator_adaptor_base::iterator_facade_base::operator-; + using BaseT::operator-; difference_type operator-(const DerivedT &RHS) const { return I - RHS.I; } // We have to explicitly provide ++ and -- rather than letting the facade // forward to += because WrappedIteratorT might not support +=. - using iterator_adaptor_base::iterator_facade_base::operator++; + using BaseT::operator++; DerivedT &operator++() { ++I; return *static_cast(this); } - using iterator_adaptor_base::iterator_facade_base::operator--; + using BaseT::operator--; DerivedT &operator--() { --I; return *static_cast(this); -- 2.34.1