diff options
| author | Eric Fiselier <eric@efcs.ca> | 2017-02-17 02:31:56 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2017-02-17 02:31:56 +0000 |
| commit | 63895ca6e74bf5e7d3ec555abddacb547a540191 (patch) | |
| tree | 7c965858d2fc8ec13bde6b76050baa53a7364a3b | |
| parent | 6eab4044b9c79cda8226b60be0a8e9641c330f27 (diff) | |
| download | bcm5719-llvm-63895ca6e74bf5e7d3ec555abddacb547a540191.tar.gz bcm5719-llvm-63895ca6e74bf5e7d3ec555abddacb547a540191.zip | |
Mark a couple for basic_string member templates as inline. no ABI change this time.
llvm-svn: 295403
| -rw-r--r-- | libcxx/include/string | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libcxx/include/string b/libcxx/include/string index f86028869f4..4d5e72b6b2e 100644 --- a/libcxx/include/string +++ b/libcxx/include/string @@ -927,7 +927,7 @@ public: basic_string& append(__self_view __sv) { return append(__sv.data(), __sv.size()); } basic_string& append(const basic_string& __str, size_type __pos, size_type __n=npos); template <class _Tp> - typename enable_if + inline typename enable_if < __can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value, basic_string& @@ -939,7 +939,7 @@ public: template <class _ForwardIterator> inline basic_string& __append_forward_unsafe(_ForwardIterator, _ForwardIterator); template<class _InputIterator> - typename enable_if + inline typename enable_if < __is_exactly_input_iterator<_InputIterator>::value || !__libcpp_string_gets_noexcept_iterator<_InputIterator>::value, @@ -952,7 +952,7 @@ public: return *this; } template<class _ForwardIterator> - typename enable_if + inline typename enable_if < __is_forward_iterator<_ForwardIterator>::value && __libcpp_string_gets_noexcept_iterator<_ForwardIterator>::value, |
