From: Justin Lebar <jlebar@google.com>
Date: Mon, 10 Oct 2016 17:18:45 +0000 (+0000)
Subject: [ADT] Attempt to fix MSVC 2015 ICE via judicious addition of std::decay to make_point... 
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f52f4a488f5f90926e8e158fc5be51104f189802;p=llvm

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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@283783 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/llvm/ADT/iterator.h b/include/llvm/ADT/iterator.h
index eced5eab523..91c1fcb1001 100644
--- a/include/llvm/ADT/iterator.h
+++ b/include/llvm/ADT/iterator.h
@@ -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