From 2c0470e781355a96f901fcf863f59b814eac20fa Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Thu, 24 Apr 2014 06:16:12 +0000 Subject: [PATCH] [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 --- include/llvm/ADT/iterator.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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 + explicit iterator_adaptor_base( + U &&u, + typename std::enable_if< !std::is_base_of::type>::type, - DerivedT>::value>::type> - explicit iterator_adaptor_base(U &&u) + DerivedT>::value, + int>::type = 0) : I(std::forward(u)) {} public: -- 2.34.1