diff options
| author | Eric Fiselier <eric@efcs.ca> | 2019-03-14 12:31:10 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2019-03-14 12:31:10 +0000 |
| commit | dfce2dd21e070d9f6b2da85dc19a1737251edd11 (patch) | |
| tree | f1af7f786644d406c601eed9b35f02b0ecfbb06b /libcxx/include/string | |
| parent | 63eccf70db0476db4847032d6c2c1b530d5d6a07 (diff) | |
| download | bcm5719-llvm-dfce2dd21e070d9f6b2da85dc19a1737251edd11.tar.gz bcm5719-llvm-dfce2dd21e070d9f6b2da85dc19a1737251edd11.zip | |
Properly constrain basic_string(Iter, Iter, Alloc = A())
llvm-svn: 356140
Diffstat (limited to 'libcxx/include/string')
| -rw-r--r-- | libcxx/include/string | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libcxx/include/string b/libcxx/include/string index e6d16142326..611e3451bcf 100644 --- a/libcxx/include/string +++ b/libcxx/include/string @@ -862,10 +862,10 @@ public: _LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS explicit basic_string(const _Tp& __t, const allocator_type& __a); - template<class _InputIterator> + template<class _InputIterator, class = typename enable_if<__is_input_iterator<_InputIterator>::value>::type> _LIBCPP_INLINE_VISIBILITY basic_string(_InputIterator __first, _InputIterator __last); - template<class _InputIterator> + template<class _InputIterator, class = typename enable_if<__is_input_iterator<_InputIterator>::value>::type> _LIBCPP_INLINE_VISIBILITY basic_string(_InputIterator __first, _InputIterator __last, const allocator_type& __a); #ifndef _LIBCPP_CXX03_LANG @@ -2077,7 +2077,7 @@ basic_string<_CharT, _Traits, _Allocator>::__init(_ForwardIterator __first, _For } template <class _CharT, class _Traits, class _Allocator> -template<class _InputIterator> +template<class _InputIterator, class> inline basic_string<_CharT, _Traits, _Allocator>::basic_string(_InputIterator __first, _InputIterator __last) { @@ -2088,7 +2088,7 @@ basic_string<_CharT, _Traits, _Allocator>::basic_string(_InputIterator __first, } template <class _CharT, class _Traits, class _Allocator> -template<class _InputIterator> +template<class _InputIterator, class> inline basic_string<_CharT, _Traits, _Allocator>::basic_string(_InputIterator __first, _InputIterator __last, const allocator_type& __a) |

