diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2016-11-14 18:22:19 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2016-11-14 18:22:19 +0000 |
| commit | 1c7fe126ee16857243738ebc1dbaea69caffefb1 (patch) | |
| tree | 9ccb4a534b61893d510b4ab870a93892479b92a6 /libcxx/include/string_view | |
| parent | ccf2fa1cb64f8b292cfbe964905c4a802fb6dd87 (diff) | |
| download | bcm5719-llvm-1c7fe126ee16857243738ebc1dbaea69caffefb1.tar.gz bcm5719-llvm-1c7fe126ee16857243738ebc1dbaea69caffefb1.zip | |
Fixes for LWG 2598, 2686, 2739, 2742, 2747, and 2759, which were adopted last week in Issaquah
llvm-svn: 286858
Diffstat (limited to 'libcxx/include/string_view')
| -rw-r--r-- | libcxx/include/string_view | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libcxx/include/string_view b/libcxx/include/string_view index baba4644552..60c0ad00fc9 100644 --- a/libcxx/include/string_view +++ b/libcxx/include/string_view @@ -164,7 +164,6 @@ namespace std { #include <__config> #include <__string> -#include <algorithm> #include <iterator> #include <__debug> @@ -320,8 +319,8 @@ public: { if (__pos > size()) __throw_out_of_range("string_view::copy"); - size_type __rlen = _VSTD::min( __n, size() - __pos ); - copy_n(begin() + __pos, __rlen, __s ); + size_type __rlen = _VSTD::min(__n, size() - __pos); + _Traits::copy(__s, data() + __pos, __rlen); return __rlen; } |
