[llvm] r283783 - [ADT] Attempt to fix MSVC 2015 ICE via judicious addition of std::decay to make_pointe{r, e}_iterator.

[Justin Lebar via llvm-commits]

Author: jlebar
Date: Mon Oct 10 12:18:45 2016
New Revision: 283783

URL: http://llvm.org/viewvc/llvm-project?rev=283783&view=rev
Log:
[ADT] Attempt to fix MSVC 2015 ICE via judicious addition of std::decay to make_pointe{r,e}_iterator.

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

Modified: llvm/trunk/include/llvm/ADT/iterator.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/iterator.h?rev=283783&r1=283782&r2=283783&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ADT/iterator.h (original)
+++ llvm/trunk/include/llvm/ADT/iterator.h Mon Oct 10 12:18:45 2016
@@ -257,8 +257,10 @@ struct pointee_iterator
 };
 
 template <typename WrappedIteratorT>
-pointee_iterator<WrappedIteratorT> make_pointee_iterator(WrappedIteratorT &&I) {
-  return pointee_iterator<WrappedIteratorT>(std::forward<WrappedIteratorT>(I));
+pointee_iterator<typename std::decay<WrappedIteratorT>::type>
+make_pointee_iterator(WrappedIteratorT &&I) {
+  return pointee_iterator<typename std::decay<WrappedIteratorT>::type>(
+      std::forward<WrappedIteratorT>(I));
 }
 
 template <typename WrappedIteratorT,
@@ -279,8 +281,10 @@ public:
 };
 
 template <typename WrappedIteratorT>
-pointer_iterator<WrappedIteratorT> make_pointer_iterator(WrappedIteratorT &&I) {
-  return pointer_iterator<WrappedIteratorT>(std::forward<WrappedIteratorT>(I));
+pointer_iterator<typename std::decay<WrappedIteratorT>::type>
+make_pointer_iterator(WrappedIteratorT &&I) {
+  return pointer_iterator<typename std::decay<WrappedIteratorT>::type>(
+      std::forward<WrappedIteratorT>(I));
 }
 
 } // namespace llvm