diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2016-05-13 22:20:43 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2016-05-13 22:20:43 +0000 |
| commit | 43b6c71e9969ea43fd2b95f07188d1266cf3f7db (patch) | |
| tree | b648e166b1bbaf77e26d0b71cb8eafd62c0f8f37 | |
| parent | e164ed2902cdf6e19b6a446d8e241a6de287acc3 (diff) | |
| download | bcm5719-llvm-43b6c71e9969ea43fd2b95f07188d1266cf3f7db.tar.gz bcm5719-llvm-43b6c71e9969ea43fd2b95f07188d1266cf3f7db.zip | |
Another attempt to fix MSVC by explicitly disabling the conversion
operator when the value type can't be initialized from the argument
type. Testing with the online MSVC compiler is finally happy with this,
let's see if the build bot will tolerate it.
llvm-svn: 269501
| -rw-r--r-- | llvm/include/llvm/ADT/Sequence.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/include/llvm/ADT/Sequence.h b/llvm/include/llvm/ADT/Sequence.h index 62d46fd2968..5d36831cc12 100644 --- a/llvm/include/llvm/ADT/Sequence.h +++ b/llvm/include/llvm/ADT/Sequence.h @@ -40,7 +40,7 @@ public: value_sequence_iterator(value_sequence_iterator &&Arg) : Value(std::move(Arg.Value)) {} - template <typename U> + template <typename U, typename Enabler = decltype(ValueT(std::declval<U>()))> value_sequence_iterator(U &&Value) : Value(std::forward<U>(Value)) {} value_sequence_iterator &operator+=(difference_type N) { |
