From 8ba95b7b4d9ca3318d177882ee4e29f119c443ef Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Sun, 2 Nov 2014 15:35:32 +0000 Subject: [PATCH] Mark string_view::to_string as const. Fixes PR21428 llvm-svn: 221101 --- libcxx/include/experimental/string_view | 3 ++- .../experimental/string.view/string.view.ops/to_string.pass.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libcxx/include/experimental/string_view b/libcxx/include/experimental/string_view index b0382e5..1870615 100644 --- a/libcxx/include/experimental/string_view +++ b/libcxx/include/experimental/string_view @@ -349,7 +349,8 @@ _LIBCPP_BEGIN_NAMESPACE_LFTS template > _LIBCPP_INLINE_VISIBILITY - basic_string<_CharT, _Traits, _Allocator> to_string( const _Allocator& __a = _Allocator()) + basic_string<_CharT, _Traits, _Allocator> + to_string( const _Allocator& __a = _Allocator()) const { return basic_string<_CharT, _Traits, _Allocator> ( begin(), end(), __a ); } size_type copy(_CharT* __s, size_type __n, size_type __pos = 0) const diff --git a/libcxx/test/experimental/string.view/string.view.ops/to_string.pass.cpp b/libcxx/test/experimental/string.view/string.view.ops/to_string.pass.cpp index e69cb95..6387ac22 100644 --- a/libcxx/test/experimental/string.view/string.view.ops/to_string.pass.cpp +++ b/libcxx/test/experimental/string.view/string.view.ops/to_string.pass.cpp @@ -24,8 +24,8 @@ template void test ( const CharT *s ) { typedef std::basic_string String ; { - std::experimental::basic_string_view sv1 ( s ); - String str1 = (String) sv1; + const std::experimental::basic_string_view sv1 ( s ); + String str1 = (String) sv1; assert ( sv1.size() == str1.size ()); assert ( std::char_traits::compare ( sv1.data(), str1.data(), sv1.size()) == 0 ); @@ -38,8 +38,8 @@ void test ( const CharT *s ) { } { - std::experimental::basic_string_view sv1; - String str1 = (String) sv1; + const std::experimental::basic_string_view sv1; + String str1 = (String) sv1; assert ( sv1.size() == str1.size ()); assert ( std::char_traits::compare ( sv1.data(), str1.data(), sv1.size()) == 0 ); -- 2.7.4