[llvm] r281183 - ADT: Fix build after r281182

[Duncan P. N. Exon Smith via llvm-commits]

Author: dexonsmith
Date: Sun Sep 11 17:55:46 2016
New Revision: 281183

URL: http://llvm.org/viewvc/llvm-project?rev=281183&view=rev
Log:
ADT: Fix build after r281182

Fix this bot:
  http://lab.llvm.org:8011/builders/clang-x86_64-linux-abi-test/builds/20680

which complained that a typedef of 'iterator_adaptor_base' changed
meaning in AllocatorList::IteratorImpl.  Use 'base_type' there instead.

Modified:
    llvm/trunk/include/llvm/ADT/AllocatorList.h

Modified: llvm/trunk/include/llvm/ADT/AllocatorList.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/AllocatorList.h?rev=281183&r1=281182&r2=281183&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ADT/AllocatorList.h (original)
+++ llvm/trunk/include/llvm/ADT/AllocatorList.h Sun Sep 11 17:55:46 2016
@@ -86,7 +86,7 @@ private:
     typedef iterator_adaptor_base<IteratorImpl<ValueT, IteratorBase>,
                                   IteratorBase, std::bidirectional_iterator_tag,
                                   ValueT>
-        iterator_adaptor_base;
+        base_type;
 
   public:
     typedef ValueT value_type;
@@ -98,15 +98,15 @@ private:
     IteratorImpl &operator=(const IteratorImpl &) = default;
     ~IteratorImpl() = default;
 
-    explicit IteratorImpl(const IteratorBase &I) : iterator_adaptor_base(I) {}
+    explicit IteratorImpl(const IteratorBase &I) : base_type(I) {}
 
     template <class OtherValueT, class OtherIteratorBase>
     IteratorImpl(const IteratorImpl<OtherValueT, OtherIteratorBase> &X,
                  typename std::enable_if<std::is_convertible<
                      OtherIteratorBase, IteratorBase>::value>::type * = nullptr)
-        : iterator_adaptor_base(X.wrapped()) {}
+        : base_type(X.wrapped()) {}
 
-    reference operator*() const { return iterator_adaptor_base::wrapped()->V; }
+    reference operator*() const { return base_type::wrapped()->V; }
     pointer operator->() const { return &operator*(); }
 
     friend bool operator==(const IteratorImpl &L, const IteratorImpl &R) {