diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2014-04-24 06:16:12 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2014-04-24 06:16:12 +0000 |
| commit | 150a5f1dd3edef5f7ab39b326be954d3d8ef4acf (patch) | |
| tree | 7acc510bff941f6dbc85e0c63b6b7e44df4aa61d | |
| parent | edfe07fca0ae8c4ef749d9fac859b17f7dd23f65 (diff) | |
| download | bcm5719-llvm-150a5f1dd3edef5f7ab39b326be954d3d8ef4acf.tar.gz bcm5719-llvm-150a5f1dd3edef5f7ab39b326be954d3d8ef4acf.zip | |
[ADT] Try to appease MSVC by sinking the enable_if from a default
template argument to a default argument to the constructor.
llvm-svn: 207082
| -rw-r--r-- | llvm/include/llvm/ADT/iterator.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/llvm/include/llvm/ADT/iterator.h b/llvm/include/llvm/ADT/iterator.h index e29225ad6c2..e64ae9abb9f 100644 --- a/llvm/include/llvm/ADT/iterator.h +++ b/llvm/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: |
