Remove non-standard basic_string_view::clear() member.
This patch removes the clear() member from <string_view>. The modifier was removed from the TS before it ever landed in the standard. There is no reason libc++ should be providing this method. llvm-svn: 302869
This commit is contained in:
parent
5b263d4ce1
commit
5b8ab693ab
|
@ -103,7 +103,6 @@ namespace std {
|
||||||
constexpr const_pointer data() const noexcept;
|
constexpr const_pointer data() const noexcept;
|
||||||
|
|
||||||
// 7.7, basic_string_view modifiers
|
// 7.7, basic_string_view modifiers
|
||||||
constexpr void clear() noexcept;
|
|
||||||
constexpr void remove_prefix(size_type n);
|
constexpr void remove_prefix(size_type n);
|
||||||
constexpr void remove_suffix(size_type n);
|
constexpr void remove_suffix(size_type n);
|
||||||
constexpr void swap(basic_string_view& s) noexcept;
|
constexpr void swap(basic_string_view& s) noexcept;
|
||||||
|
@ -292,13 +291,6 @@ public:
|
||||||
const_pointer data() const _NOEXCEPT { return __data; }
|
const_pointer data() const _NOEXCEPT { return __data; }
|
||||||
|
|
||||||
// [string.view.modifiers], modifiers:
|
// [string.view.modifiers], modifiers:
|
||||||
_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
|
|
||||||
void clear() _NOEXCEPT
|
|
||||||
{
|
|
||||||
__data = nullptr;
|
|
||||||
__size = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
|
_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
|
||||||
void remove_prefix(size_type __n) _NOEXCEPT
|
void remove_prefix(size_type __n) _NOEXCEPT
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,67 +0,0 @@
|
||||||
//===----------------------------------------------------------------------===//
|
|
||||||
//
|
|
||||||
// The LLVM Compiler Infrastructure
|
|
||||||
//
|
|
||||||
// This file is dual licensed under the MIT and the University of Illinois Open
|
|
||||||
// Source Licenses. See LICENSE.TXT for details.
|
|
||||||
//
|
|
||||||
//===----------------------------------------------------------------------===//
|
|
||||||
|
|
||||||
|
|
||||||
// <string_view>
|
|
||||||
|
|
||||||
// void clear() noexcept
|
|
||||||
|
|
||||||
#include <string_view>
|
|
||||||
#include <cassert>
|
|
||||||
|
|
||||||
#include "test_macros.h"
|
|
||||||
|
|
||||||
template<typename CharT>
|
|
||||||
void test ( const CharT *s, size_t len ) {
|
|
||||||
typedef std::basic_string_view<CharT> SV;
|
|
||||||
{
|
|
||||||
SV sv1 ( s );
|
|
||||||
assert ( sv1.size() == len );
|
|
||||||
assert ( sv1.data() == s );
|
|
||||||
|
|
||||||
sv1.clear ();
|
|
||||||
assert ( sv1.data() == nullptr );
|
|
||||||
assert ( sv1.size() == 0 );
|
|
||||||
assert ( sv1 == SV());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#if TEST_STD_VER > 11
|
|
||||||
constexpr size_t test_ce ( size_t n ) {
|
|
||||||
typedef std::basic_string_view<char> SV;
|
|
||||||
SV sv1{ "ABCDEFGHIJKL", n };
|
|
||||||
sv1.clear();
|
|
||||||
return sv1.size();
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
int main () {
|
|
||||||
test ( "ABCDE", 5 );
|
|
||||||
test ( "a", 1 );
|
|
||||||
test ( "", 0 );
|
|
||||||
|
|
||||||
test ( L"ABCDE", 5 );
|
|
||||||
test ( L"a", 1 );
|
|
||||||
test ( L"", 0 );
|
|
||||||
|
|
||||||
#if TEST_STD_VER >= 11
|
|
||||||
test ( u"ABCDE", 5 );
|
|
||||||
test ( u"a", 1 );
|
|
||||||
test ( u"", 0 );
|
|
||||||
|
|
||||||
test ( U"ABCDE", 5 );
|
|
||||||
test ( U"a", 1 );
|
|
||||||
test ( U"", 0 );
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if TEST_STD_VER > 11
|
|
||||||
static_assert ( test_ce (5) == 0, "" );
|
|
||||||
#endif
|
|
||||||
|
|
||||||
}
|
|
Loading…
Reference in New Issue