#endif
}
- // Get a raw pointer (rather than _Alloc::pointer).
- _CharT*
- _M_c_str() const
- { return std::__addressof(*_M_dataplus._M_p); }
-
void
_M_capacity(size_type __capacity)
{ _M_allocated_capacity = __capacity; }
bool
_M_disjunct(const _CharT* __s) const _GLIBCXX_NOEXCEPT
{
- return (less<const _CharT*>()(__s, data())
- || less<const _CharT*>()(data() + this->size(), __s));
+ return (less<const _CharT*>()(__s, _M_data())
+ || less<const _CharT*>()(_M_data() + this->size(), __s));
}
// When __n = 1 way faster than the general multichar
size_type __n = npos)
: _M_dataplus(_M_local_data())
{
- const _CharT* __start = __str.data()
+ const _CharT* __start = __str._M_data()
+ __str._M_check(__pos, "basic_string::basic_string");
_M_construct(__start, __start + __str._M_limit(__pos, __n));
}
size_type __n, const _Alloc& __a)
: _M_dataplus(_M_local_data(), __a)
{
- const _CharT* __start = __str.data()
- + __str._M_check(__pos, "basic_string::basic_string");
+ const _CharT* __start
+ = __str._M_data() + __str._M_check(__pos, "string::string");
_M_construct(__start, __start + __str._M_limit(__pos, __n));
}
*/
basic_string&
append(const basic_string& __str)
- { return _M_append(__str.data(), __str.size()); }
+ { return _M_append(__str._M_data(), __str.size()); }
/**
* @brief Append a substring.
*/
basic_string&
append(const basic_string& __str, size_type __pos, size_type __n)
- { return _M_append(__str.data()
+ { return _M_append(__str._M_data()
+ __str._M_check(__pos, "basic_string::append"),
__str._M_limit(__pos, __n)); }
*/
basic_string&
assign(const basic_string& __str, size_type __pos, size_type __n)
- { return _M_replace(size_type(0), this->size(), __str.data()
+ { return _M_replace(size_type(0), this->size(), __str._M_data()
+ __str._M_check(__pos, "basic_string::assign"),
__str._M_limit(__pos, __n)); }
basic_string&
insert(size_type __pos1, const basic_string& __str)
{ return this->replace(__pos1, size_type(0),
- __str.data(), __str.size()); }
+ __str._M_data(), __str.size()); }
/**
* @brief Insert a substring.
basic_string&
insert(size_type __pos1, const basic_string& __str,
size_type __pos2, size_type __n)
- { return this->replace(__pos1, size_type(0), __str.data()
+ { return this->replace(__pos1, size_type(0), __str._M_data()
+ __str._M_check(__pos2, "basic_string::insert"),
__str._M_limit(__pos2, __n)); }
*/
basic_string&
replace(size_type __pos, size_type __n, const basic_string& __str)
- { return this->replace(__pos, __n, __str.data(), __str.size()); }
+ { return this->replace(__pos, __n, __str._M_data(), __str.size()); }
/**
* @brief Replace characters with value from another string.
basic_string&
replace(size_type __pos1, size_type __n1, const basic_string& __str,
size_type __pos2, size_type __n2)
- { return this->replace(__pos1, __n1, __str.data()
+ { return this->replace(__pos1, __n1, __str._M_data()
+ __str._M_check(__pos2, "basic_string::replace"),
__str._M_limit(__pos2, __n2)); }
basic_string&
replace(__const_iterator __i1, __const_iterator __i2,
const basic_string& __str)
- { return this->replace(__i1, __i2, __str.data(), __str.size()); }
+ { return this->replace(__i1, __i2, __str._M_data(), __str.size()); }
/**
* @brief Replace range of characters with C substring.
*/
const _CharT*
c_str() const _GLIBCXX_NOEXCEPT
- { return _M_c_str(); }
+ { return _M_data(); }
/**
* @brief Return const pointer to contents.
*
- * This is a pointer to internal data. Do not modify or dire things may
+ * This is a handle to internal data. Do not modify or dire things may
* happen.
*/
const _CharT*
data() const _GLIBCXX_NOEXCEPT
- { return _M_c_str(); }
-
-#if __cplusplus > 201402L
- /**
- * @brief Return non-const pointer to contents.
- *
- * This is a pointer to the character sequence held by the string.
- * Modifying the characters in the sequence is allowed.
- */
- _CharT*
- data() noexcept
- { return _M_c_str(); }
-#endif
+ { return _M_data(); }
/**
* @brief Return copy of allocator used to construct this string.
const size_type __osize = __str.size();
const size_type __len = std::min(__size, __osize);
- int __r = traits_type::compare(data(), __str.data(), __len);
+ int __r = traits_type::compare(_M_data(), __str.data(), __len);
if (!__r)
__r = _S_compare(__size, __osize);
return __r;
data() const _GLIBCXX_NOEXCEPT
{ return _M_data(); }
-#if __cplusplus > 201402L
- _CharT*
- data() noexcept
- { return _M_data(); }
-#endif
-
/**
* @brief Return copy of allocator used to construct this string.
*/
size_type __new_capacity = length() + __len2 - __len1;
pointer __r = _M_create(__new_capacity, capacity());
- _CharT* __p = std::__addressof(*__r);
if (__pos)
- this->_S_copy(__p, _M_c_str(), __pos);
+ this->_S_copy(__r, _M_data(), __pos);
if (__s && __len2)
- this->_S_copy(__p + __pos, __s, __len2);
+ this->_S_copy(__r + __pos, __s, __len2);
if (__how_much)
- this->_S_copy(__p + __pos + __len2,
- _M_c_str() + __pos + __len1, __how_much);
+ this->_S_copy(__r + __pos + __len2,
+ _M_data() + __pos + __len1, __how_much);
_M_dispose();
_M_data(__r);
{
const size_type __how_much = length() - __pos - __n;
- _CharT* __p = _M_c_str();
if (__how_much && __n)
- this->_S_move(__p + __pos, __p + __pos + __n, __how_much);
+ this->_S_move(_M_data() + __pos, _M_data() + __pos + __n, __how_much);
_M_set_length(length() - __n);
}
if (__new_size <= this->capacity())
{
- _CharT* __p = this->_M_c_str() + __pos1;
+ pointer __p = this->_M_data() + __pos1;
const size_type __how_much = __old_size - __pos1 - __n1;
if (__how_much && __n1 != __n2)
this->_M_mutate(__pos1, __n1, 0, __n2);
if (__n2)
- this->_S_assign(this->_M_c_str() + __pos1, __n2, __c);
+ this->_S_assign(this->_M_data() + __pos1, __n2, __c);
this->_M_set_length(__new_size);
return *this;
{
__glibcxx_requires_string_len(__s, __n);
const size_type __size = this->size();
- const _CharT* __data = data();
+ const _CharT* __data = _M_data();
if (__n == 0)
return __pos <= __size ? __pos : npos;
+++ /dev/null
-// Copyright (C) 2016 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library. This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3. If not see
-// <http://www.gnu.org/licenses/>.
-
-// { dg-options "-std=gnu++11" }
-
-#include <string>
-#include <memory>
-#include <testsuite_hooks.h>
-#include <testsuite_allocator.h>
-
-using C = char;
-const C c = 'a';
-using traits = std::char_traits<C>;
-
-// basic_string is not required to support fancy pointers:
-// http://cplusplus.github.io/LWG/lwg-closed.html#2084
-
-using __gnu_test::CustomPointerAlloc;
-
-void test01()
-{
-#if _GLIBCXX_USE_CXX11_ABI
- bool test __attribute__((unused)) = true;
- typedef CustomPointerAlloc<C> alloc_type;
- typedef std::basic_string<C, traits, alloc_type> test_type;
- test_type v;
- v.assign(1, c);
- VERIFY( ++v.begin() == v.end() );
-
- v.assign(100, c);
- VERIFY( (v.begin() + 100) == v.end() );
-#endif
-}
-
-int main()
-{
- test01();
-}
projects / gcc.git / commitdiff