From: Chandler Carruth <chandlerc@gmail.com>
Date: Thu, 24 Apr 2014 06:16:12 +0000 (+0000)
Subject: [ADT] Try to appease MSVC by sinking the enable_if from a default
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=2c0470e781355a96f901fcf863f59b814eac20fa;p=oota-llvm.git

[ADT] Try to appease MSVC by sinking the enable_if from a default
template argument to a default argument to the constructor.

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

diff --git a/include/llvm/ADT/iterator.h b/include/llvm/ADT/iterator.h
index e29225ad6c2..e64ae9abb9f 100644
--- a/include/llvm/ADT/iterator.h
+++ b/include/llvm/ADT/iterator.h
@@ -109,13 +109,14 @@ protected:
 
   iterator_adaptor_base() {}
 
-  template <
-      typename U,
-      typename = typename std::enable_if<
+  template <typename U>
+  explicit iterator_adaptor_base(
+      U &&u,
+      typename std::enable_if<
           !std::is_base_of<typename std::remove_cv<
                                typename std::remove_reference<U>::type>::type,
-                           DerivedT>::value>::type>
-  explicit iterator_adaptor_base(U &&u)
+                           DerivedT>::value,
+          int>::type = 0)
       : I(std::forward<U &&>(u)) {}
 
 public: