summaryrefslogtreecommitdiff
path: root/include/experimental/string_view
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2017-01-14 15:39:13 +0000
committerDimitry Andric <dim@FreeBSD.org>2017-01-14 15:39:13 +0000
commitfd857c8184809f0fac54f7ec9d9e91477beb1b7d (patch)
tree58ed2d52992ba3dcfcc9e34d35ab3ed8b7aa76ed /include/experimental/string_view
parent78da6db1f23c0bfe8a36a5b5c05d06005037e556 (diff)
Vendor import of libc++ release_40 branch r292009:vendor/libc++/libc++-release_40-r292009
Notes
svn path=/vendor/libc++/dist/; revision=312179 svn path=/vendor/libc++/libc++-release_40-r292009/; revision=312180; tag=vendor/libc++/libc++-release_40-r292009
Diffstat (limited to 'include/experimental/string_view')
-rw-r--r--include/experimental/string_view7
1 files changed, 1 insertions, 6 deletions
diff --git a/include/experimental/string_view b/include/experimental/string_view
index 674f6c355fb4..41c0d34d3c84 100644
--- a/include/experimental/string_view
+++ b/include/experimental/string_view
@@ -340,12 +340,7 @@ _LIBCPP_BEGIN_NAMESPACE_LFTS
// [string.view.ops], string operations:
template<class _Allocator>
_LIBCPP_INLINE_VISIBILITY
- // Clang's extended C++11 explict conversions don't work with
- // string_view in C++03.
-#ifndef _LIBCPP_CXX03_LANG
- _LIBCPP_EXPLICIT
-#endif
- operator basic_string<_CharT, _Traits, _Allocator>() const
+ _LIBCPP_EXPLICIT operator basic_string<_CharT, _Traits, _Allocator>() const
{ return basic_string<_CharT, _Traits, _Allocator>( begin(), end()); }
template<class _Allocator = allocator<_CharT> >