diff options
author | Chandler Carruth <chandlerc@gmail.com> | 2014-04-24 21:10:35 +0000 |
---|---|---|
committer | Chandler Carruth <chandlerc@gmail.com> | 2014-04-24 21:10:35 +0000 |
commit | 01f21349f26fc4765f90dc4b1b9e335bfc2550dc (patch) | |
tree | 491fcbca20b1385386cb96841fdc10ca31f143b2 /include | |
parent | fda5e19b96afdc33d16b9b006e703d8fe91801fa (diff) | |
download | llvm-01f21349f26fc4765f90dc4b1b9e335bfc2550dc.tar.gz llvm-01f21349f26fc4765f90dc4b1b9e335bfc2550dc.tar.bz2 llvm-01f21349f26fc4765f90dc4b1b9e335bfc2550dc.tar.xz |
[ADT] Generalize pointee_iterator to smart pointers by using decltype.
Based on review feedback from Dave on the original patch.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@207146 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include')
-rw-r--r-- | include/llvm/ADT/iterator.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/llvm/ADT/iterator.h b/include/llvm/ADT/iterator.h index b1d29a8862..00d0ba15ed 100644 --- a/include/llvm/ADT/iterator.h +++ b/include/llvm/ADT/iterator.h @@ -163,10 +163,9 @@ public: /// \code /// typedef pointee_iterator<SmallVectorImpl<T *>::iterator> iterator; /// \endcode -template < - typename WrappedIteratorT, - typename T = typename std::remove_pointer< - typename std::iterator_traits<WrappedIteratorT>::value_type>::type> +template <typename WrappedIteratorT, + typename T = typename std::remove_reference< + decltype(**std::declval<WrappedIteratorT>())>::type> struct pointee_iterator : iterator_adaptor_base<pointee_iterator<WrappedIteratorT>, WrappedIteratorT, T> { |