[PATCH] D54377: Correctly instantiate `iterator_adaptor_base` when defining `pointer_iterator`

[Dylan MacKenzie via Phabricator via llvm-commits]

ecstatic-morse created this revision.
Herald added subscribers: llvm-commits, kristina, dexonsmith.

The definition of `pointer_iterator` omits what should be a `iterator_traits::<>::iterator_category` parameter from `iterator_adaptor_base`. As a result, iterators based on `pointer_iterator` always have defaulted value types.

The definition of `pointee_iterator` just a few lines above does this correctly.


Repository:
  rL LLVM

https://reviews.llvm.org/D54377

Files:
  include/llvm/ADT/iterator.h


Index: include/llvm/ADT/iterator.h
===================================================================
--- include/llvm/ADT/iterator.h
+++ include/llvm/ADT/iterator.h
@@ -309,8 +309,10 @@
 template <typename WrappedIteratorT,
           typename T = decltype(&*std::declval<WrappedIteratorT>())>
 class pointer_iterator
-    : public iterator_adaptor_base<pointer_iterator<WrappedIteratorT, T>,
-                                   WrappedIteratorT, T> {
+    : public iterator_adaptor_base<
+          pointer_iterator<WrappedIteratorT, T>, WrappedIteratorT,
+          typename std::iterator_traits<WrappedIteratorT>::iterator_category,
+          T> {
   mutable T Ptr;
 
 public:


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D54377.173506.patch
Type: text/x-patch
Size: 683 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20181110/893b288c/attachment.bin>