2005-07-06 01:07:18 +02:00
|
|
|
// Versatile string -*- C++ -*-
|
|
|
|
|
2013-02-03 18:54:05 +01:00
|
|
|
// Copyright (C) 2005-2013 Free Software Foundation, Inc.
|
2005-07-06 01:07:18 +02:00
|
|
|
//
|
|
|
|
// 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
|
2009-04-09 17:00:19 +02:00
|
|
|
// Free Software Foundation; either version 3, or (at your option)
|
2005-07-06 01:07:18 +02:00
|
|
|
// 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.
|
|
|
|
|
2009-04-09 17:00:19 +02:00
|
|
|
// Under Section 7 of GPL version 3, you are granted additional
|
|
|
|
// permissions described in the GCC Runtime Library Exception, version
|
|
|
|
// 3.1, as published by the Free Software Foundation.
|
|
|
|
|
|
|
|
// You should have received a copy of the GNU General Public License and
|
|
|
|
// a copy of the GCC Runtime Library Exception along with this program;
|
|
|
|
// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
|
|
// <http://www.gnu.org/licenses/>.
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/** @file ext/vstring.h
|
|
|
|
* This file is a GNU extension to the Standard C++ Library.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef _VSTRING_H
|
|
|
|
#define _VSTRING_H 1
|
|
|
|
|
|
|
|
#pragma GCC system_header
|
|
|
|
|
2012-11-10 18:27:22 +01:00
|
|
|
#if __cplusplus >= 201103L
|
2008-07-21 21:40:39 +02:00
|
|
|
#include <initializer_list>
|
2011-11-01 05:02:45 +01:00
|
|
|
#endif
|
|
|
|
|
2005-07-06 01:07:18 +02:00
|
|
|
#include <ext/vstring_util.h>
|
|
|
|
#include <ext/rc_string_base.h>
|
|
|
|
#include <ext/sso_string_base.h>
|
|
|
|
|
PR libstdc++/36104 part four
2011-01-30 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/36104 part four
* include/bits/c++config (_GLIBCXX_STD): Remove.
(_GLIBCXX_STD_D, _GLIBCXX_PR): Now _GLIBCXX_STD_C.
(_GLIBCXX_P): Now _GLIBCXX_STD_A.
(_GLIBCXX_NAMESPACE_DEBUG, _GLIBCXX_NAMESPACE_PARALLEL,
_GLIBCXX_NAMESPACE_PROFILE, _GLIBCXX_NAMESPACE_VERSION): Remove.
(_GLIBCXX_INLINE_DEBUG, _GLIBCXX_INLINE_PARALLEL,
_GLIBCXX_INLINE_PROFILE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE(X)): Remove.
(_GLIBCXX_END_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NESTED_NAMESPACE(X, Y)): Remove.
(_GLIBCXX_END_NESTED_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE_ALGO): Add.
(_GLIBCXX_END_NAMESPACE_ALGO): Add.
(_GLIBCXX_BEGIN_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_END_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_BEGIN_NAMESPACE_VERSION): Add.
(_GLIBCXX_END_NAMESPACE_VERSION): Add.
(_GLIBCXX_BEGIN_LDBL_NAMESPACE): To _GLIBCXX_BEGIN_NAMESPACE_LDBL.
(_GLIBCXX_END_LDBL_NAMESPACE): To _GLIBCXX_END_NAMESPACE_LDBL.
(_GLIBCXX_VISIBILITY_ATTR): Revert to _GLIBCXX_VISIBILITY.
* include/*: Use new macros for namespace scope.
* config/*: Same.
* src/*: Same.
* src/Makefile.am (sources): Remove debug_list.cc, add
compatibility-debug_list-2.cc.
(parallel_sources): Remove parallel_list.cc, add
compatibility-parallel_list-2.cc.
(compatibility-parallel_list-2.[o,lo]): New rule.
* src/Makefile.in: Regenerate.
* src/debug_list.cc: Remove.
* src/parallel_list.cc: Remove.
* src/compatibility-list-2.cc: New.
* src/compatibility-debug_list-2.cc: New.
* src/compatibility-parallel_list-2.cc: New.
* doc/doxygen/user.cfg.in: Adjust macros.
* testsuite/20_util/auto_ptr/assign_neg.cc: Adjust line numbers, macros.
* testsuite/20_util/declval/requirements/1_neg.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg1.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg2.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg3.cc: Same.
* testsuite/20_util/forward/c_neg.cc: Same.
* testsuite/20_util/forward/f_neg.cc: Same.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Same.
* testsuite/20_util/ratio/operations/ops_overflow_neg.cc: Same.
* testsuite/20_util/shared_ptr/cons/43820_neg.cc: Same.
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/forward_list/capacity/1.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
assign_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
insert_neg.cc: Same.
* testsuite/23_containers/list/capacity/29134.cc: Same.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/vector/bool/capacity/29134.cc: Same.
* testsuite/23_containers/vector/bool/modifiers/insert/31370.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: Same.
* testsuite/25_algorithms/sort/35588.cc: Same.
* testsuite/27_io/ios_base/cons/assign_neg.cc: Same.
* testsuite/27_io/ios_base/cons/copy_neg.cc: Same.
* testsuite/ext/profile/mutex_extensions_neg.cc: Same.
* testsuite/ext/profile/profiler_algos.cc: Same.
* testsuite/ext/type_traits/add_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/add_unsigned_integer_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_integer_neg.cc: Same.
* testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc: Same.
From-SVN: r169421
2011-01-30 23:39:36 +01:00
|
|
|
namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
|
|
|
|
{
|
|
|
|
_GLIBCXX_BEGIN_NAMESPACE_VERSION
|
2005-12-19 01:56:05 +01:00
|
|
|
|
2005-07-06 01:07:18 +02:00
|
|
|
/**
|
|
|
|
* @class __versa_string vstring.h
|
2010-02-10 06:45:24 +01:00
|
|
|
* @brief Template class __versa_string.
|
|
|
|
* @ingroup extensions
|
|
|
|
*
|
|
|
|
* Data structure managing sequences of characters and
|
|
|
|
* character-like objects.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
class __versa_string
|
|
|
|
: private _Base<_CharT, _Traits, _Alloc>
|
|
|
|
{
|
2010-01-08 14:01:24 +01:00
|
|
|
typedef _Base<_CharT, _Traits, _Alloc> __vstring_base;
|
2005-07-06 01:07:18 +02:00
|
|
|
typedef typename __vstring_base::_CharT_alloc_type _CharT_alloc_type;
|
|
|
|
|
|
|
|
// Types:
|
|
|
|
public:
|
|
|
|
typedef _Traits traits_type;
|
|
|
|
typedef typename _Traits::char_type value_type;
|
|
|
|
typedef _Alloc allocator_type;
|
|
|
|
typedef typename _CharT_alloc_type::size_type size_type;
|
|
|
|
typedef typename _CharT_alloc_type::difference_type difference_type;
|
2010-05-31 16:14:42 +02:00
|
|
|
typedef value_type& reference;
|
|
|
|
typedef const value_type& const_reference;
|
2005-07-06 01:07:18 +02:00
|
|
|
typedef typename _CharT_alloc_type::pointer pointer;
|
|
|
|
typedef typename _CharT_alloc_type::const_pointer const_pointer;
|
|
|
|
typedef __gnu_cxx::__normal_iterator<pointer, __versa_string> iterator;
|
|
|
|
typedef __gnu_cxx::__normal_iterator<const_pointer, __versa_string>
|
|
|
|
const_iterator;
|
|
|
|
typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
|
|
|
|
typedef std::reverse_iterator<iterator> reverse_iterator;
|
|
|
|
|
2005-10-19 16:25:31 +02:00
|
|
|
// Data Member (public):
|
2005-07-06 01:07:18 +02:00
|
|
|
/// Value returned by various member functions when they fail.
|
|
|
|
static const size_type npos = static_cast<size_type>(-1);
|
|
|
|
|
|
|
|
private:
|
|
|
|
size_type
|
|
|
|
_M_check(size_type __pos, const char* __s) const
|
|
|
|
{
|
|
|
|
if (__pos > this->size())
|
|
|
|
std::__throw_out_of_range(__N(__s));
|
|
|
|
return __pos;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
_M_check_length(size_type __n1, size_type __n2, const char* __s) const
|
|
|
|
{
|
|
|
|
if (this->max_size() - (this->size() - __n1) < __n2)
|
|
|
|
std::__throw_length_error(__N(__s));
|
|
|
|
}
|
|
|
|
|
|
|
|
// NB: _M_limit doesn't check for a bad __pos value.
|
|
|
|
size_type
|
|
|
|
_M_limit(size_type __pos, size_type __off) const
|
|
|
|
{
|
|
|
|
const bool __testoff = __off < this->size() - __pos;
|
|
|
|
return __testoff ? __off : this->size() - __pos;
|
|
|
|
}
|
|
|
|
|
|
|
|
// True if _Rep and source do not overlap.
|
|
|
|
bool
|
|
|
|
_M_disjunct(const _CharT* __s) const
|
|
|
|
{
|
|
|
|
return (std::less<const _CharT*>()(__s, this->_M_data())
|
|
|
|
|| std::less<const _CharT*>()(this->_M_data()
|
|
|
|
+ this->size(), __s));
|
|
|
|
}
|
|
|
|
|
|
|
|
// For the internal use we have functions similar to `begin'/`end'
|
|
|
|
// but they do not call _M_leak.
|
|
|
|
iterator
|
|
|
|
_M_ibegin() const
|
|
|
|
{ return iterator(this->_M_data()); }
|
|
|
|
|
|
|
|
iterator
|
|
|
|
_M_iend() const
|
|
|
|
{ return iterator(this->_M_data() + this->_M_length()); }
|
|
|
|
|
|
|
|
public:
|
|
|
|
// Construct/copy/destroy:
|
|
|
|
// NB: We overload ctors in some cases instead of using default
|
|
|
|
// arguments, per 17.4.4.4 para. 2 item 2.
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Default constructor creates an empty string.
|
|
|
|
*/
|
|
|
|
__versa_string()
|
|
|
|
: __vstring_base() { }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Construct an empty string using allocator @a a.
|
|
|
|
*/
|
|
|
|
explicit
|
|
|
|
__versa_string(const _Alloc& __a)
|
|
|
|
: __vstring_base(__a) { }
|
|
|
|
|
|
|
|
// NB: per LWG issue 42, semantics different from IS:
|
|
|
|
/**
|
2011-08-07 09:27:06 +02:00
|
|
|
* @brief Construct string with copy of value of @a __str.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __str Source string.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
__versa_string(const __versa_string& __str)
|
|
|
|
: __vstring_base(__str) { }
|
|
|
|
|
2012-11-10 18:27:22 +01:00
|
|
|
#if __cplusplus >= 201103L
|
2007-10-16 17:20:09 +02:00
|
|
|
/**
|
|
|
|
* @brief String move constructor.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __str Source string.
|
2007-10-16 17:20:09 +02:00
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* The newly-constructed %string contains the exact contents of
|
2011-08-07 09:27:06 +02:00
|
|
|
* @a __str. The contents of @a __str are a valid, but unspecified
|
2009-02-21 01:45:21 +01:00
|
|
|
* string.
|
2007-10-16 17:20:09 +02:00
|
|
|
*/
|
2011-05-31 14:50:31 +02:00
|
|
|
__versa_string(__versa_string&& __str) noexcept
|
2010-08-05 09:34:08 +02:00
|
|
|
: __vstring_base(std::move(__str)) { }
|
2008-07-21 21:40:39 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Construct string from an initializer list.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __l std::initializer_list of characters.
|
|
|
|
* @param __a Allocator to use (default is default allocator).
|
2008-07-21 21:40:39 +02:00
|
|
|
*/
|
2008-07-22 15:52:14 +02:00
|
|
|
__versa_string(std::initializer_list<_CharT> __l,
|
|
|
|
const _Alloc& __a = _Alloc())
|
|
|
|
: __vstring_base(__l.begin(), __l.end(), __a) { }
|
2007-10-16 17:20:09 +02:00
|
|
|
#endif
|
|
|
|
|
2005-07-06 01:07:18 +02:00
|
|
|
/**
|
|
|
|
* @brief Construct string as copy of a substring.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __str Source string.
|
|
|
|
* @param __pos Index of first character to copy from.
|
|
|
|
* @param __n Number of characters to copy (default remainder).
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
__versa_string(const __versa_string& __str, size_type __pos,
|
|
|
|
size_type __n = npos)
|
|
|
|
: __vstring_base(__str._M_data()
|
|
|
|
+ __str._M_check(__pos,
|
|
|
|
"__versa_string::__versa_string"),
|
|
|
|
__str._M_data() + __str._M_limit(__pos, __n)
|
|
|
|
+ __pos, _Alloc()) { }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Construct string as copy of a substring.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __str Source string.
|
|
|
|
* @param __pos Index of first character to copy from.
|
|
|
|
* @param __n Number of characters to copy.
|
|
|
|
* @param __a Allocator to use.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
__versa_string(const __versa_string& __str, size_type __pos,
|
|
|
|
size_type __n, const _Alloc& __a)
|
|
|
|
: __vstring_base(__str._M_data()
|
|
|
|
+ __str._M_check(__pos,
|
|
|
|
"__versa_string::__versa_string"),
|
|
|
|
__str._M_data() + __str._M_limit(__pos, __n)
|
|
|
|
+ __pos, __a) { }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Construct string initialized by a character array.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __s Source character array.
|
|
|
|
* @param __n Number of characters to copy.
|
|
|
|
* @param __a Allocator to use (default is default allocator).
|
2005-07-06 01:07:18 +02:00
|
|
|
*
|
2009-03-11 16:16:21 +01:00
|
|
|
* NB: @a __s must have at least @a __n characters, '\\0' has no special
|
2005-07-06 01:07:18 +02:00
|
|
|
* meaning.
|
|
|
|
*/
|
|
|
|
__versa_string(const _CharT* __s, size_type __n,
|
|
|
|
const _Alloc& __a = _Alloc())
|
|
|
|
: __vstring_base(__s, __s + __n, __a) { }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Construct string as copy of a C string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __s Source C string.
|
|
|
|
* @param __a Allocator to use (default is default allocator).
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
__versa_string(const _CharT* __s, const _Alloc& __a = _Alloc())
|
|
|
|
: __vstring_base(__s, __s ? __s + traits_type::length(__s) :
|
|
|
|
__s + npos, __a) { }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Construct string as multiple characters.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __n Number of characters.
|
|
|
|
* @param __c Character to use.
|
|
|
|
* @param __a Allocator to use (default is default allocator).
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
__versa_string(size_type __n, _CharT __c, const _Alloc& __a = _Alloc())
|
|
|
|
: __vstring_base(__n, __c, __a) { }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Construct string as copy of a range.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __beg Start of range.
|
|
|
|
* @param __end End of range.
|
|
|
|
* @param __a Allocator to use (default is default allocator).
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
2012-11-10 18:27:22 +01:00
|
|
|
#if __cplusplus >= 201103L
|
re PR libstdc++/43813 ([DR1234] vector<T*>(3, NULL) fails to compile)
2012-03-04 Paolo Carlini <paolo.carlini@oracle.com>
Jonathan Wakely <jwakely.gcc@gmail.com>
PR libstdc++/43813
* include/bits/stl_iterator_base_types.h (_RequireInputIter): New.
* include/ext/vstring.h (__versa_string<>::__versa_string
(_InputIterator, _InputIterator, const _Alloc&),
__versa_string<>::append(_InputIterator, _InputIterator),
__versa_string<>::assign(_InputIterator, _InputIterator),
__versa_string<>::insert(iterator, _InputIterator,
_InputIterator), __versa_string<>::replace(iterator, iterator,
_InputIterator, _InputIterator)): Use it.
* include/bits/stl_list.h (list<>::list(_InputIterator,
_InputIterator, const allocator_type&), list<>::assign(_InputIterator,
_InputIterator), list<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/stl_vector.h (vector<>::vector(_InputIterator,
_InputIterator, const allocator_type&), vector<>::assign(_InputIterator,
_InputIterator), vectort<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/stl_deque.h (deque<>::deque(_InputIterator,
_InputIterator, const allocator_type&), deque<>::deque(_InputIterator,
_InputIterator), deque<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/stl_bvector.h (vector<>::vector(_InputIterator,
_InputIterator, const allocator_type&), vector<>::deque(_InputIterator,
_InputIterator), vector<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/forward_list.h (forward_list<>::forward_list
(_InputIterator, _InputIterator, const allocator_type&),
forward_list<>::assign(_InputIterator, _InputIterator),
forward_list<>::insert_after(const_iterator, _InputIterator,
_InputIterator)): Likewise.
(forward_list<>::_M_initialize_dispatch(,, __true_type): Remove.
(forward_list<>::_M_range_initialize): Add, adjust everywhere.
* include/bits/forward_list.tcc: Adjust.
* include/debug/forward_list: Adjust.
* include/debug/vector: Likewise.
* include/debug/deque: Likewise.
* include/debug/list: Likewise.
* testsuite/ext/vstring/requirements/do_the_right_thing.cc: New.
* testsuite/23_containers/forward_list/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/vector/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/deque/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/list/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
assign_neg.cc: Adjust dg-error line number.
* testsuite/23_containers/forward_list/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
assign_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
assign_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
assign_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
Co-Authored-By: Jonathan Wakely <jwakely.gcc@gmail.com>
From-SVN: r184911
2012-03-05 02:15:28 +01:00
|
|
|
template<class _InputIterator,
|
|
|
|
typename = std::_RequireInputIter<_InputIterator>>
|
|
|
|
#else
|
2005-07-06 01:07:18 +02:00
|
|
|
template<class _InputIterator>
|
re PR libstdc++/43813 ([DR1234] vector<T*>(3, NULL) fails to compile)
2012-03-04 Paolo Carlini <paolo.carlini@oracle.com>
Jonathan Wakely <jwakely.gcc@gmail.com>
PR libstdc++/43813
* include/bits/stl_iterator_base_types.h (_RequireInputIter): New.
* include/ext/vstring.h (__versa_string<>::__versa_string
(_InputIterator, _InputIterator, const _Alloc&),
__versa_string<>::append(_InputIterator, _InputIterator),
__versa_string<>::assign(_InputIterator, _InputIterator),
__versa_string<>::insert(iterator, _InputIterator,
_InputIterator), __versa_string<>::replace(iterator, iterator,
_InputIterator, _InputIterator)): Use it.
* include/bits/stl_list.h (list<>::list(_InputIterator,
_InputIterator, const allocator_type&), list<>::assign(_InputIterator,
_InputIterator), list<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/stl_vector.h (vector<>::vector(_InputIterator,
_InputIterator, const allocator_type&), vector<>::assign(_InputIterator,
_InputIterator), vectort<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/stl_deque.h (deque<>::deque(_InputIterator,
_InputIterator, const allocator_type&), deque<>::deque(_InputIterator,
_InputIterator), deque<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/stl_bvector.h (vector<>::vector(_InputIterator,
_InputIterator, const allocator_type&), vector<>::deque(_InputIterator,
_InputIterator), vector<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/forward_list.h (forward_list<>::forward_list
(_InputIterator, _InputIterator, const allocator_type&),
forward_list<>::assign(_InputIterator, _InputIterator),
forward_list<>::insert_after(const_iterator, _InputIterator,
_InputIterator)): Likewise.
(forward_list<>::_M_initialize_dispatch(,, __true_type): Remove.
(forward_list<>::_M_range_initialize): Add, adjust everywhere.
* include/bits/forward_list.tcc: Adjust.
* include/debug/forward_list: Adjust.
* include/debug/vector: Likewise.
* include/debug/deque: Likewise.
* include/debug/list: Likewise.
* testsuite/ext/vstring/requirements/do_the_right_thing.cc: New.
* testsuite/23_containers/forward_list/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/vector/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/deque/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/list/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
assign_neg.cc: Adjust dg-error line number.
* testsuite/23_containers/forward_list/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
assign_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
assign_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
assign_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
Co-Authored-By: Jonathan Wakely <jwakely.gcc@gmail.com>
From-SVN: r184911
2012-03-05 02:15:28 +01:00
|
|
|
#endif
|
2005-07-06 01:07:18 +02:00
|
|
|
__versa_string(_InputIterator __beg, _InputIterator __end,
|
|
|
|
const _Alloc& __a = _Alloc())
|
|
|
|
: __vstring_base(__beg, __end, __a) { }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Destroy the string instance.
|
|
|
|
*/
|
2011-06-01 16:16:19 +02:00
|
|
|
~__versa_string() _GLIBCXX_NOEXCEPT { }
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Assign the value of @a str to this string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __str Source string.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
operator=(const __versa_string& __str)
|
|
|
|
{ return this->assign(__str); }
|
|
|
|
|
2012-11-10 18:27:22 +01:00
|
|
|
#if __cplusplus >= 201103L
|
2007-10-16 17:20:09 +02:00
|
|
|
/**
|
|
|
|
* @brief String move assignment operator.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __str Source string.
|
2007-10-16 17:20:09 +02:00
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* The contents of @a __str are moved into this string (without
|
|
|
|
* copying). @a __str is a valid, but unspecified string.
|
2007-10-16 17:20:09 +02:00
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
operator=(__versa_string&& __str)
|
|
|
|
{
|
2010-01-09 12:16:42 +01:00
|
|
|
// NB: DR 1204.
|
|
|
|
this->swap(__str);
|
2007-10-16 17:20:09 +02:00
|
|
|
return *this;
|
|
|
|
}
|
2008-07-21 21:40:39 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Set value to string constructed from initializer list.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __l std::initializer_list.
|
2008-07-21 21:40:39 +02:00
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
operator=(std::initializer_list<_CharT> __l)
|
|
|
|
{
|
2008-07-22 15:52:14 +02:00
|
|
|
this->assign(__l.begin(), __l.end());
|
2008-07-21 21:40:39 +02:00
|
|
|
return *this;
|
|
|
|
}
|
2007-10-16 17:20:09 +02:00
|
|
|
#endif
|
|
|
|
|
2005-07-06 01:07:18 +02:00
|
|
|
/**
|
2009-02-21 01:45:21 +01:00
|
|
|
* @brief Copy contents of @a __s into this string.
|
|
|
|
* @param __s Source null-terminated string.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
operator=(const _CharT* __s)
|
|
|
|
{ return this->assign(__s); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Set value to string of length 1.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __c Source character.
|
2005-07-06 01:07:18 +02:00
|
|
|
*
|
|
|
|
* Assigning to a character makes this string length 1 and
|
2009-02-21 01:45:21 +01:00
|
|
|
* (*this)[0] == @a __c.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
operator=(_CharT __c)
|
|
|
|
{
|
|
|
|
this->assign(1, __c);
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Iterators:
|
|
|
|
/**
|
|
|
|
* Returns a read/write iterator that points to the first character in
|
|
|
|
* the %string. Unshares the string.
|
|
|
|
*/
|
|
|
|
iterator
|
2011-05-31 14:50:31 +02:00
|
|
|
begin() _GLIBCXX_NOEXCEPT
|
2005-07-06 01:07:18 +02:00
|
|
|
{
|
|
|
|
this->_M_leak();
|
|
|
|
return iterator(this->_M_data());
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a read-only (constant) iterator that points to the first
|
|
|
|
* character in the %string.
|
|
|
|
*/
|
|
|
|
const_iterator
|
2011-05-31 14:50:31 +02:00
|
|
|
begin() const _GLIBCXX_NOEXCEPT
|
2005-07-06 01:07:18 +02:00
|
|
|
{ return const_iterator(this->_M_data()); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a read/write iterator that points one past the last
|
|
|
|
* character in the %string. Unshares the string.
|
|
|
|
*/
|
|
|
|
iterator
|
2011-05-31 14:50:31 +02:00
|
|
|
end() _GLIBCXX_NOEXCEPT
|
2005-07-06 01:07:18 +02:00
|
|
|
{
|
|
|
|
this->_M_leak();
|
|
|
|
return iterator(this->_M_data() + this->size());
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a read-only (constant) iterator that points one past the
|
|
|
|
* last character in the %string.
|
|
|
|
*/
|
|
|
|
const_iterator
|
2011-05-31 14:50:31 +02:00
|
|
|
end() const _GLIBCXX_NOEXCEPT
|
2005-07-06 01:07:18 +02:00
|
|
|
{ return const_iterator(this->_M_data() + this->size()); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a read/write reverse iterator that points to the last
|
|
|
|
* character in the %string. Iteration is done in reverse element
|
|
|
|
* order. Unshares the string.
|
|
|
|
*/
|
|
|
|
reverse_iterator
|
2011-05-31 14:50:31 +02:00
|
|
|
rbegin() _GLIBCXX_NOEXCEPT
|
2005-07-06 01:07:18 +02:00
|
|
|
{ return reverse_iterator(this->end()); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a read-only (constant) reverse iterator that points
|
|
|
|
* to the last character in the %string. Iteration is done in
|
|
|
|
* reverse element order.
|
|
|
|
*/
|
|
|
|
const_reverse_iterator
|
2011-05-31 14:50:31 +02:00
|
|
|
rbegin() const _GLIBCXX_NOEXCEPT
|
2005-07-06 01:07:18 +02:00
|
|
|
{ return const_reverse_iterator(this->end()); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a read/write reverse iterator that points to one before the
|
|
|
|
* first character in the %string. Iteration is done in reverse
|
|
|
|
* element order. Unshares the string.
|
|
|
|
*/
|
|
|
|
reverse_iterator
|
2011-05-31 14:50:31 +02:00
|
|
|
rend() _GLIBCXX_NOEXCEPT
|
2005-07-06 01:07:18 +02:00
|
|
|
{ return reverse_iterator(this->begin()); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a read-only (constant) reverse iterator that points
|
|
|
|
* to one before the first character in the %string. Iteration
|
|
|
|
* is done in reverse element order.
|
|
|
|
*/
|
|
|
|
const_reverse_iterator
|
2011-05-31 14:50:31 +02:00
|
|
|
rend() const _GLIBCXX_NOEXCEPT
|
2005-07-06 01:07:18 +02:00
|
|
|
{ return const_reverse_iterator(this->begin()); }
|
|
|
|
|
2012-11-10 18:27:22 +01:00
|
|
|
#if __cplusplus >= 201103L
|
set.h (set<>::cbegin, [...]): Add.
2007-10-15 Paolo Carlini <pcarlini@suse.de>
* include/debug/set.h (set<>::cbegin, cend, crbegin, crend): Add.
* include/debug/multiset.h (set<>::cbegin, cend, crbegin, crend):
Likewise.
* include/debug/vector (vector<>::cbegin, cend, crbegin, crend):
Likewise.
* include/debug/map.h (map<>::cbegin, cend, crbegin, crend):
Likewise.
* include/debug/deque (deque<>::cbegin, cend, crbegin, crend):
Likewise.
* include/debug/list (list<>::cbegin, cend, crbegin, crend):
Likewise.
* include/debug/multimap.h (multimap<>::cbegin, cend, crbegin,
crend): Likewise.
* include/tr1_impl/array (array<>::cbegin, cend, crbegin, crend):
Likewise.
* include/ext/vstring.h (__versa_string<>::cbegin, cend, crbegin,
crend): Likewise.
* include/bits/stl_list.h (list<>::cbegin, cend, crbegin, crend):
Likewise.
* include/bits/stl_map.h (map<>::cbegin, cend, crbegin, crend):
Likewise.
* include/bits/stl_set.h (set<>::cbegin, cend, crbegin, crend):
Likewise.
* include/bits/stl_multimap.h (multimap<>::cbegin, cend, crbegin,
crend): Likewise.
* include/bits/stl_vector.h (vector<>::cbegin, cend, crbegin, crend):
Likewise.
* include/bits/stl_deque.h (deque<>::cbegin, cend, crbegin, crend):
Likewise.
* include/bits/stl_multiset.h (multiset<>::cbegin, cend, crbegin,
crend): Likewise.
* include/bits/stl_bvector.h (vector<bool>::cbegin, cend, crbegin,
crend): Likewise.
* include/tr1_impl/hashtable (_Hashtable<>::cbegin, cend): Add.
* testsuite/ext/vstring/requirements/citerators.cc: Add.
* testsuite/23_containers/unordered_map/requirements/citerators.cc:
Likewise.
* testsuite/23_containers/multimap/requirements/citerators.cc:
Likewise.
* testsuite/23_containers/set/requirements/citerators.cc: Likewise.
* testsuite/23_containers/unordered_multimap/requirements/
citerators.cc: Likewise.
* testsuite/23_containers/unordered_set/requirements/citerators.cc:
Likewise.
* testsuite/23_containers/vector/requirements/citerators.cc: Likewise.
* testsuite/23_containers/vector/bool/requirements/citerators.cc:
Likewise.
* testsuite/23_containers/deque/requirements/citerators.cc: Likewise.
* testsuite/23_containers/multiset/requirements/citerators.cc:
Likewise.
* testsuite/23_containers/list/requirements/citerators.cc: Likewise.
* testsuite/23_containers/unordered_multiset/requirements/
citerators.cc: Likewise.
* testsuite/23_containers/map/requirements/citerators.cc: Likewise.
* testsuite/23_containers/array/requirements/citerators.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc:
Adjust dg-error lines.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc:
Likewise.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
From-SVN: r129370
2007-10-15 22:51:53 +02:00
|
|
|
/**
|
|
|
|
* Returns a read-only (constant) iterator that points to the first
|
|
|
|
* character in the %string.
|
|
|
|
*/
|
|
|
|
const_iterator
|
2011-05-31 14:50:31 +02:00
|
|
|
cbegin() const noexcept
|
set.h (set<>::cbegin, [...]): Add.
2007-10-15 Paolo Carlini <pcarlini@suse.de>
* include/debug/set.h (set<>::cbegin, cend, crbegin, crend): Add.
* include/debug/multiset.h (set<>::cbegin, cend, crbegin, crend):
Likewise.
* include/debug/vector (vector<>::cbegin, cend, crbegin, crend):
Likewise.
* include/debug/map.h (map<>::cbegin, cend, crbegin, crend):
Likewise.
* include/debug/deque (deque<>::cbegin, cend, crbegin, crend):
Likewise.
* include/debug/list (list<>::cbegin, cend, crbegin, crend):
Likewise.
* include/debug/multimap.h (multimap<>::cbegin, cend, crbegin,
crend): Likewise.
* include/tr1_impl/array (array<>::cbegin, cend, crbegin, crend):
Likewise.
* include/ext/vstring.h (__versa_string<>::cbegin, cend, crbegin,
crend): Likewise.
* include/bits/stl_list.h (list<>::cbegin, cend, crbegin, crend):
Likewise.
* include/bits/stl_map.h (map<>::cbegin, cend, crbegin, crend):
Likewise.
* include/bits/stl_set.h (set<>::cbegin, cend, crbegin, crend):
Likewise.
* include/bits/stl_multimap.h (multimap<>::cbegin, cend, crbegin,
crend): Likewise.
* include/bits/stl_vector.h (vector<>::cbegin, cend, crbegin, crend):
Likewise.
* include/bits/stl_deque.h (deque<>::cbegin, cend, crbegin, crend):
Likewise.
* include/bits/stl_multiset.h (multiset<>::cbegin, cend, crbegin,
crend): Likewise.
* include/bits/stl_bvector.h (vector<bool>::cbegin, cend, crbegin,
crend): Likewise.
* include/tr1_impl/hashtable (_Hashtable<>::cbegin, cend): Add.
* testsuite/ext/vstring/requirements/citerators.cc: Add.
* testsuite/23_containers/unordered_map/requirements/citerators.cc:
Likewise.
* testsuite/23_containers/multimap/requirements/citerators.cc:
Likewise.
* testsuite/23_containers/set/requirements/citerators.cc: Likewise.
* testsuite/23_containers/unordered_multimap/requirements/
citerators.cc: Likewise.
* testsuite/23_containers/unordered_set/requirements/citerators.cc:
Likewise.
* testsuite/23_containers/vector/requirements/citerators.cc: Likewise.
* testsuite/23_containers/vector/bool/requirements/citerators.cc:
Likewise.
* testsuite/23_containers/deque/requirements/citerators.cc: Likewise.
* testsuite/23_containers/multiset/requirements/citerators.cc:
Likewise.
* testsuite/23_containers/list/requirements/citerators.cc: Likewise.
* testsuite/23_containers/unordered_multiset/requirements/
citerators.cc: Likewise.
* testsuite/23_containers/map/requirements/citerators.cc: Likewise.
* testsuite/23_containers/array/requirements/citerators.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc:
Adjust dg-error lines.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc:
Likewise.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
From-SVN: r129370
2007-10-15 22:51:53 +02:00
|
|
|
{ return const_iterator(this->_M_data()); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a read-only (constant) iterator that points one past the
|
|
|
|
* last character in the %string.
|
|
|
|
*/
|
|
|
|
const_iterator
|
2011-05-31 14:50:31 +02:00
|
|
|
cend() const noexcept
|
set.h (set<>::cbegin, [...]): Add.
2007-10-15 Paolo Carlini <pcarlini@suse.de>
* include/debug/set.h (set<>::cbegin, cend, crbegin, crend): Add.
* include/debug/multiset.h (set<>::cbegin, cend, crbegin, crend):
Likewise.
* include/debug/vector (vector<>::cbegin, cend, crbegin, crend):
Likewise.
* include/debug/map.h (map<>::cbegin, cend, crbegin, crend):
Likewise.
* include/debug/deque (deque<>::cbegin, cend, crbegin, crend):
Likewise.
* include/debug/list (list<>::cbegin, cend, crbegin, crend):
Likewise.
* include/debug/multimap.h (multimap<>::cbegin, cend, crbegin,
crend): Likewise.
* include/tr1_impl/array (array<>::cbegin, cend, crbegin, crend):
Likewise.
* include/ext/vstring.h (__versa_string<>::cbegin, cend, crbegin,
crend): Likewise.
* include/bits/stl_list.h (list<>::cbegin, cend, crbegin, crend):
Likewise.
* include/bits/stl_map.h (map<>::cbegin, cend, crbegin, crend):
Likewise.
* include/bits/stl_set.h (set<>::cbegin, cend, crbegin, crend):
Likewise.
* include/bits/stl_multimap.h (multimap<>::cbegin, cend, crbegin,
crend): Likewise.
* include/bits/stl_vector.h (vector<>::cbegin, cend, crbegin, crend):
Likewise.
* include/bits/stl_deque.h (deque<>::cbegin, cend, crbegin, crend):
Likewise.
* include/bits/stl_multiset.h (multiset<>::cbegin, cend, crbegin,
crend): Likewise.
* include/bits/stl_bvector.h (vector<bool>::cbegin, cend, crbegin,
crend): Likewise.
* include/tr1_impl/hashtable (_Hashtable<>::cbegin, cend): Add.
* testsuite/ext/vstring/requirements/citerators.cc: Add.
* testsuite/23_containers/unordered_map/requirements/citerators.cc:
Likewise.
* testsuite/23_containers/multimap/requirements/citerators.cc:
Likewise.
* testsuite/23_containers/set/requirements/citerators.cc: Likewise.
* testsuite/23_containers/unordered_multimap/requirements/
citerators.cc: Likewise.
* testsuite/23_containers/unordered_set/requirements/citerators.cc:
Likewise.
* testsuite/23_containers/vector/requirements/citerators.cc: Likewise.
* testsuite/23_containers/vector/bool/requirements/citerators.cc:
Likewise.
* testsuite/23_containers/deque/requirements/citerators.cc: Likewise.
* testsuite/23_containers/multiset/requirements/citerators.cc:
Likewise.
* testsuite/23_containers/list/requirements/citerators.cc: Likewise.
* testsuite/23_containers/unordered_multiset/requirements/
citerators.cc: Likewise.
* testsuite/23_containers/map/requirements/citerators.cc: Likewise.
* testsuite/23_containers/array/requirements/citerators.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc:
Adjust dg-error lines.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc:
Likewise.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
From-SVN: r129370
2007-10-15 22:51:53 +02:00
|
|
|
{ return const_iterator(this->_M_data() + this->size()); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a read-only (constant) reverse iterator that points
|
|
|
|
* to the last character in the %string. Iteration is done in
|
|
|
|
* reverse element order.
|
|
|
|
*/
|
|
|
|
const_reverse_iterator
|
2011-05-31 14:50:31 +02:00
|
|
|
crbegin() const noexcept
|
set.h (set<>::cbegin, [...]): Add.
2007-10-15 Paolo Carlini <pcarlini@suse.de>
* include/debug/set.h (set<>::cbegin, cend, crbegin, crend): Add.
* include/debug/multiset.h (set<>::cbegin, cend, crbegin, crend):
Likewise.
* include/debug/vector (vector<>::cbegin, cend, crbegin, crend):
Likewise.
* include/debug/map.h (map<>::cbegin, cend, crbegin, crend):
Likewise.
* include/debug/deque (deque<>::cbegin, cend, crbegin, crend):
Likewise.
* include/debug/list (list<>::cbegin, cend, crbegin, crend):
Likewise.
* include/debug/multimap.h (multimap<>::cbegin, cend, crbegin,
crend): Likewise.
* include/tr1_impl/array (array<>::cbegin, cend, crbegin, crend):
Likewise.
* include/ext/vstring.h (__versa_string<>::cbegin, cend, crbegin,
crend): Likewise.
* include/bits/stl_list.h (list<>::cbegin, cend, crbegin, crend):
Likewise.
* include/bits/stl_map.h (map<>::cbegin, cend, crbegin, crend):
Likewise.
* include/bits/stl_set.h (set<>::cbegin, cend, crbegin, crend):
Likewise.
* include/bits/stl_multimap.h (multimap<>::cbegin, cend, crbegin,
crend): Likewise.
* include/bits/stl_vector.h (vector<>::cbegin, cend, crbegin, crend):
Likewise.
* include/bits/stl_deque.h (deque<>::cbegin, cend, crbegin, crend):
Likewise.
* include/bits/stl_multiset.h (multiset<>::cbegin, cend, crbegin,
crend): Likewise.
* include/bits/stl_bvector.h (vector<bool>::cbegin, cend, crbegin,
crend): Likewise.
* include/tr1_impl/hashtable (_Hashtable<>::cbegin, cend): Add.
* testsuite/ext/vstring/requirements/citerators.cc: Add.
* testsuite/23_containers/unordered_map/requirements/citerators.cc:
Likewise.
* testsuite/23_containers/multimap/requirements/citerators.cc:
Likewise.
* testsuite/23_containers/set/requirements/citerators.cc: Likewise.
* testsuite/23_containers/unordered_multimap/requirements/
citerators.cc: Likewise.
* testsuite/23_containers/unordered_set/requirements/citerators.cc:
Likewise.
* testsuite/23_containers/vector/requirements/citerators.cc: Likewise.
* testsuite/23_containers/vector/bool/requirements/citerators.cc:
Likewise.
* testsuite/23_containers/deque/requirements/citerators.cc: Likewise.
* testsuite/23_containers/multiset/requirements/citerators.cc:
Likewise.
* testsuite/23_containers/list/requirements/citerators.cc: Likewise.
* testsuite/23_containers/unordered_multiset/requirements/
citerators.cc: Likewise.
* testsuite/23_containers/map/requirements/citerators.cc: Likewise.
* testsuite/23_containers/array/requirements/citerators.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc:
Adjust dg-error lines.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc:
Likewise.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
From-SVN: r129370
2007-10-15 22:51:53 +02:00
|
|
|
{ return const_reverse_iterator(this->end()); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a read-only (constant) reverse iterator that points
|
|
|
|
* to one before the first character in the %string. Iteration
|
|
|
|
* is done in reverse element order.
|
|
|
|
*/
|
|
|
|
const_reverse_iterator
|
2011-05-31 14:50:31 +02:00
|
|
|
crend() const noexcept
|
set.h (set<>::cbegin, [...]): Add.
2007-10-15 Paolo Carlini <pcarlini@suse.de>
* include/debug/set.h (set<>::cbegin, cend, crbegin, crend): Add.
* include/debug/multiset.h (set<>::cbegin, cend, crbegin, crend):
Likewise.
* include/debug/vector (vector<>::cbegin, cend, crbegin, crend):
Likewise.
* include/debug/map.h (map<>::cbegin, cend, crbegin, crend):
Likewise.
* include/debug/deque (deque<>::cbegin, cend, crbegin, crend):
Likewise.
* include/debug/list (list<>::cbegin, cend, crbegin, crend):
Likewise.
* include/debug/multimap.h (multimap<>::cbegin, cend, crbegin,
crend): Likewise.
* include/tr1_impl/array (array<>::cbegin, cend, crbegin, crend):
Likewise.
* include/ext/vstring.h (__versa_string<>::cbegin, cend, crbegin,
crend): Likewise.
* include/bits/stl_list.h (list<>::cbegin, cend, crbegin, crend):
Likewise.
* include/bits/stl_map.h (map<>::cbegin, cend, crbegin, crend):
Likewise.
* include/bits/stl_set.h (set<>::cbegin, cend, crbegin, crend):
Likewise.
* include/bits/stl_multimap.h (multimap<>::cbegin, cend, crbegin,
crend): Likewise.
* include/bits/stl_vector.h (vector<>::cbegin, cend, crbegin, crend):
Likewise.
* include/bits/stl_deque.h (deque<>::cbegin, cend, crbegin, crend):
Likewise.
* include/bits/stl_multiset.h (multiset<>::cbegin, cend, crbegin,
crend): Likewise.
* include/bits/stl_bvector.h (vector<bool>::cbegin, cend, crbegin,
crend): Likewise.
* include/tr1_impl/hashtable (_Hashtable<>::cbegin, cend): Add.
* testsuite/ext/vstring/requirements/citerators.cc: Add.
* testsuite/23_containers/unordered_map/requirements/citerators.cc:
Likewise.
* testsuite/23_containers/multimap/requirements/citerators.cc:
Likewise.
* testsuite/23_containers/set/requirements/citerators.cc: Likewise.
* testsuite/23_containers/unordered_multimap/requirements/
citerators.cc: Likewise.
* testsuite/23_containers/unordered_set/requirements/citerators.cc:
Likewise.
* testsuite/23_containers/vector/requirements/citerators.cc: Likewise.
* testsuite/23_containers/vector/bool/requirements/citerators.cc:
Likewise.
* testsuite/23_containers/deque/requirements/citerators.cc: Likewise.
* testsuite/23_containers/multiset/requirements/citerators.cc:
Likewise.
* testsuite/23_containers/list/requirements/citerators.cc: Likewise.
* testsuite/23_containers/unordered_multiset/requirements/
citerators.cc: Likewise.
* testsuite/23_containers/map/requirements/citerators.cc: Likewise.
* testsuite/23_containers/array/requirements/citerators.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc:
Adjust dg-error lines.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc:
Likewise.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
From-SVN: r129370
2007-10-15 22:51:53 +02:00
|
|
|
{ return const_reverse_iterator(this->begin()); }
|
|
|
|
#endif
|
|
|
|
|
2005-07-06 01:07:18 +02:00
|
|
|
public:
|
|
|
|
// Capacity:
|
|
|
|
/// Returns the number of characters in the string, not including any
|
|
|
|
/// null-termination.
|
|
|
|
size_type
|
2011-05-31 14:50:31 +02:00
|
|
|
size() const _GLIBCXX_NOEXCEPT
|
2005-07-06 01:07:18 +02:00
|
|
|
{ return this->_M_length(); }
|
|
|
|
|
|
|
|
/// Returns the number of characters in the string, not including any
|
|
|
|
/// null-termination.
|
|
|
|
size_type
|
2011-05-31 14:50:31 +02:00
|
|
|
length() const _GLIBCXX_NOEXCEPT
|
2005-07-06 01:07:18 +02:00
|
|
|
{ return this->_M_length(); }
|
|
|
|
|
|
|
|
/// Returns the size() of the largest possible %string.
|
|
|
|
size_type
|
2011-05-31 14:50:31 +02:00
|
|
|
max_size() const _GLIBCXX_NOEXCEPT
|
2005-10-19 16:25:31 +02:00
|
|
|
{ return this->_M_max_size(); }
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Resizes the %string to the specified number of characters.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __n Number of characters the %string should contain.
|
|
|
|
* @param __c Character to fill any new elements.
|
2005-07-06 01:07:18 +02:00
|
|
|
*
|
|
|
|
* This function will %resize the %string to the specified
|
|
|
|
* number of characters. If the number is smaller than the
|
|
|
|
* %string's current size the %string is truncated, otherwise
|
2009-02-21 01:45:21 +01:00
|
|
|
* the %string is extended and new elements are set to @a __c.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
void
|
|
|
|
resize(size_type __n, _CharT __c);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Resizes the %string to the specified number of characters.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __n Number of characters the %string should contain.
|
2005-07-06 01:07:18 +02:00
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* This function will resize the %string to the specified
|
|
|
|
* length. If the new size is smaller than the %string's
|
|
|
|
* current size the %string is truncated, otherwise the %string
|
|
|
|
* is extended and new characters are default-constructed. For
|
|
|
|
* basic types such as char, this means setting them to 0.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
void
|
|
|
|
resize(size_type __n)
|
|
|
|
{ this->resize(__n, _CharT()); }
|
|
|
|
|
2012-11-10 18:27:22 +01:00
|
|
|
#if __cplusplus >= 201103L
|
2010-01-08 14:01:24 +01:00
|
|
|
/// A non-binding request to reduce capacity() to size().
|
|
|
|
void
|
|
|
|
shrink_to_fit()
|
|
|
|
{
|
2011-06-12 17:51:36 +02:00
|
|
|
if (capacity() > size())
|
|
|
|
{
|
|
|
|
__try
|
|
|
|
{ this->reserve(0); }
|
|
|
|
__catch(...)
|
|
|
|
{ }
|
|
|
|
}
|
2010-01-08 14:01:24 +01:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2005-07-06 01:07:18 +02:00
|
|
|
/**
|
2009-02-21 01:45:21 +01:00
|
|
|
* Returns the total number of characters that the %string can
|
|
|
|
* hold before needing to allocate more memory.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
size_type
|
2011-05-31 14:50:31 +02:00
|
|
|
capacity() const _GLIBCXX_NOEXCEPT
|
2005-07-06 01:07:18 +02:00
|
|
|
{ return this->_M_capacity(); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Attempt to preallocate enough memory for specified number of
|
|
|
|
* characters.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __res_arg Number of characters required.
|
|
|
|
* @throw std::length_error If @a __res_arg exceeds @c max_size().
|
2005-07-06 01:07:18 +02:00
|
|
|
*
|
|
|
|
* This function attempts to reserve enough memory for the
|
|
|
|
* %string to hold the specified number of characters. If the
|
|
|
|
* number requested is more than max_size(), length_error is
|
|
|
|
* thrown.
|
|
|
|
*
|
|
|
|
* The advantage of this function is that if optimal code is a
|
2009-02-21 01:45:21 +01:00
|
|
|
* necessity and the user can determine the string length that
|
|
|
|
* will be required, the user can reserve the memory in
|
|
|
|
* %advance, and thus prevent a possible reallocation of memory
|
|
|
|
* and copying of %string data.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
void
|
|
|
|
reserve(size_type __res_arg = 0)
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
{ this->_M_reserve(__res_arg); }
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Erases the string, making it empty.
|
|
|
|
*/
|
|
|
|
void
|
2011-05-31 14:50:31 +02:00
|
|
|
clear() _GLIBCXX_NOEXCEPT
|
2006-08-18 17:42:05 +02:00
|
|
|
{ this->_M_clear(); }
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
2010-02-04 19:20:34 +01:00
|
|
|
* Returns true if the %string is empty. Equivalent to
|
|
|
|
* <code>*this == ""</code>.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
bool
|
2011-05-31 14:50:31 +02:00
|
|
|
empty() const _GLIBCXX_NOEXCEPT
|
2005-07-06 01:07:18 +02:00
|
|
|
{ return this->size() == 0; }
|
|
|
|
|
|
|
|
// Element access:
|
|
|
|
/**
|
|
|
|
* @brief Subscript access to the data contained in the %string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __pos The index of the character to access.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Read-only (constant) reference to the character.
|
|
|
|
*
|
|
|
|
* This operator allows for easy, array-style, data access.
|
|
|
|
* Note that data access with this operator is unchecked and
|
|
|
|
* out_of_range lookups are not defined. (For checked lookups
|
|
|
|
* see at().)
|
|
|
|
*/
|
|
|
|
const_reference
|
|
|
|
operator[] (size_type __pos) const
|
|
|
|
{
|
|
|
|
_GLIBCXX_DEBUG_ASSERT(__pos <= this->size());
|
|
|
|
return this->_M_data()[__pos];
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Subscript access to the data contained in the %string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __pos The index of the character to access.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Read/write reference to the character.
|
|
|
|
*
|
|
|
|
* This operator allows for easy, array-style, data access.
|
|
|
|
* Note that data access with this operator is unchecked and
|
|
|
|
* out_of_range lookups are not defined. (For checked lookups
|
|
|
|
* see at().) Unshares the string.
|
|
|
|
*/
|
|
|
|
reference
|
|
|
|
operator[](size_type __pos)
|
|
|
|
{
|
2006-03-28 14:54:04 +02:00
|
|
|
// allow pos == size() as v3 extension:
|
|
|
|
_GLIBCXX_DEBUG_ASSERT(__pos <= this->size());
|
|
|
|
// but be strict in pedantic mode:
|
|
|
|
_GLIBCXX_DEBUG_PEDASSERT(__pos < this->size());
|
2005-07-06 01:07:18 +02:00
|
|
|
this->_M_leak();
|
|
|
|
return this->_M_data()[__pos];
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Provides access to the data contained in the %string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __n The index of the character to access.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Read-only (const) reference to the character.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @throw std::out_of_range If @a __n is an invalid index.
|
2005-07-06 01:07:18 +02:00
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* This function provides for safer data access. The parameter
|
|
|
|
* is first checked that it is in the range of the string. The
|
|
|
|
* function throws out_of_range if the check fails.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
const_reference
|
|
|
|
at(size_type __n) const
|
|
|
|
{
|
|
|
|
if (__n >= this->size())
|
|
|
|
std::__throw_out_of_range(__N("__versa_string::at"));
|
|
|
|
return this->_M_data()[__n];
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Provides access to the data contained in the %string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __n The index of the character to access.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Read/write reference to the character.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @throw std::out_of_range If @a __n is an invalid index.
|
2005-07-06 01:07:18 +02:00
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* This function provides for safer data access. The parameter
|
|
|
|
* is first checked that it is in the range of the string. The
|
|
|
|
* function throws out_of_range if the check fails. Success
|
|
|
|
* results in unsharing the string.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
reference
|
|
|
|
at(size_type __n)
|
|
|
|
{
|
|
|
|
if (__n >= this->size())
|
|
|
|
std::__throw_out_of_range(__N("__versa_string::at"));
|
|
|
|
this->_M_leak();
|
|
|
|
return this->_M_data()[__n];
|
|
|
|
}
|
|
|
|
|
2012-11-10 18:27:22 +01:00
|
|
|
#if __cplusplus >= 201103L
|
2007-10-17 02:46:27 +02:00
|
|
|
/**
|
|
|
|
* Returns a read/write reference to the data at the first
|
|
|
|
* element of the %string.
|
|
|
|
*/
|
|
|
|
reference
|
|
|
|
front()
|
2010-05-31 16:14:42 +02:00
|
|
|
{ return operator[](0); }
|
2007-10-17 02:46:27 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a read-only (constant) reference to the data at the first
|
|
|
|
* element of the %string.
|
|
|
|
*/
|
|
|
|
const_reference
|
|
|
|
front() const
|
2010-05-31 16:14:42 +02:00
|
|
|
{ return operator[](0); }
|
2007-10-17 02:46:27 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a read/write reference to the data at the last
|
|
|
|
* element of the %string.
|
|
|
|
*/
|
|
|
|
reference
|
|
|
|
back()
|
2010-05-31 16:14:42 +02:00
|
|
|
{ return operator[](this->size() - 1); }
|
2007-10-17 02:46:27 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a read-only (constant) reference to the data at the
|
|
|
|
* last element of the %string.
|
|
|
|
*/
|
|
|
|
const_reference
|
|
|
|
back() const
|
2010-05-31 16:14:42 +02:00
|
|
|
{ return operator[](this->size() - 1); }
|
2007-10-17 02:46:27 +02:00
|
|
|
#endif
|
|
|
|
|
2005-07-06 01:07:18 +02:00
|
|
|
// Modifiers:
|
|
|
|
/**
|
|
|
|
* @brief Append a string to this string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __str The string to append.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Reference to this string.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
operator+=(const __versa_string& __str)
|
|
|
|
{ return this->append(__str); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Append a C string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __s The C string to append.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Reference to this string.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
operator+=(const _CharT* __s)
|
|
|
|
{ return this->append(__s); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Append a character.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __c The character to append.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Reference to this string.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
operator+=(_CharT __c)
|
|
|
|
{
|
|
|
|
this->push_back(__c);
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
2012-11-10 18:27:22 +01:00
|
|
|
#if __cplusplus >= 201103L
|
2008-07-21 21:40:39 +02:00
|
|
|
/**
|
|
|
|
* @brief Append an initializer_list of characters.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __l The initializer_list of characters to be appended.
|
2008-07-21 21:40:39 +02:00
|
|
|
* @return Reference to this string.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
operator+=(std::initializer_list<_CharT> __l)
|
|
|
|
{ return this->append(__l.begin(), __l.end()); }
|
2012-11-10 18:27:22 +01:00
|
|
|
#endif // C++11
|
2008-07-21 21:40:39 +02:00
|
|
|
|
2005-07-06 01:07:18 +02:00
|
|
|
/**
|
|
|
|
* @brief Append a string to this string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __str The string to append.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Reference to this string.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
append(const __versa_string& __str)
|
|
|
|
{ return _M_append(__str._M_data(), __str.size()); }
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Append a substring.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __str The string to append.
|
|
|
|
* @param __pos Index of the first character of str to append.
|
|
|
|
* @param __n The number of characters to append.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Reference to this string.
|
|
|
|
* @throw std::out_of_range if @a pos is not a valid index.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* This function appends @a __n characters from @a __str
|
|
|
|
* starting at @a __pos to this string. If @a __n is is larger
|
|
|
|
* than the number of available characters in @a __str, the
|
|
|
|
* remainder of @a __str is appended.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
__versa_string&
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
append(const __versa_string& __str, size_type __pos, size_type __n)
|
|
|
|
{ return _M_append(__str._M_data()
|
|
|
|
+ __str._M_check(__pos, "__versa_string::append"),
|
|
|
|
__str._M_limit(__pos, __n)); }
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Append a C substring.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __s The C string to append.
|
|
|
|
* @param __n The number of characters to append.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Reference to this string.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
append(const _CharT* __s, size_type __n)
|
|
|
|
{
|
|
|
|
__glibcxx_requires_string_len(__s, __n);
|
|
|
|
_M_check_length(size_type(0), __n, "__versa_string::append");
|
|
|
|
return _M_append(__s, __n);
|
|
|
|
}
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Append a C string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __s The C string to append.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Reference to this string.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
append(const _CharT* __s)
|
|
|
|
{
|
|
|
|
__glibcxx_requires_string(__s);
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
const size_type __n = traits_type::length(__s);
|
|
|
|
_M_check_length(size_type(0), __n, "__versa_string::append");
|
|
|
|
return _M_append(__s, __n);
|
2005-07-06 01:07:18 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Append multiple characters.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __n The number of characters to append.
|
|
|
|
* @param __c The character to use.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Reference to this string.
|
|
|
|
*
|
|
|
|
* Appends n copies of c to this string.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
append(size_type __n, _CharT __c)
|
|
|
|
{ return _M_replace_aux(this->size(), size_type(0), __n, __c); }
|
2005-07-06 01:07:18 +02:00
|
|
|
|
2012-11-10 18:27:22 +01:00
|
|
|
#if __cplusplus >= 201103L
|
2008-07-21 21:40:39 +02:00
|
|
|
/**
|
|
|
|
* @brief Append an initializer_list of characters.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __l The initializer_list of characters to append.
|
2008-07-21 21:40:39 +02:00
|
|
|
* @return Reference to this string.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
append(std::initializer_list<_CharT> __l)
|
|
|
|
{ return this->append(__l.begin(), __l.end()); }
|
2012-11-10 18:27:22 +01:00
|
|
|
#endif // C++11
|
2008-07-21 21:40:39 +02:00
|
|
|
|
2005-07-06 01:07:18 +02:00
|
|
|
/**
|
|
|
|
* @brief Append a range of characters.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __first Iterator referencing the first character to append.
|
|
|
|
* @param __last Iterator marking the end of the range.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Reference to this string.
|
|
|
|
*
|
|
|
|
* Appends characters in the range [first,last) to this string.
|
|
|
|
*/
|
2012-11-10 18:27:22 +01:00
|
|
|
#if __cplusplus >= 201103L
|
re PR libstdc++/43813 ([DR1234] vector<T*>(3, NULL) fails to compile)
2012-03-04 Paolo Carlini <paolo.carlini@oracle.com>
Jonathan Wakely <jwakely.gcc@gmail.com>
PR libstdc++/43813
* include/bits/stl_iterator_base_types.h (_RequireInputIter): New.
* include/ext/vstring.h (__versa_string<>::__versa_string
(_InputIterator, _InputIterator, const _Alloc&),
__versa_string<>::append(_InputIterator, _InputIterator),
__versa_string<>::assign(_InputIterator, _InputIterator),
__versa_string<>::insert(iterator, _InputIterator,
_InputIterator), __versa_string<>::replace(iterator, iterator,
_InputIterator, _InputIterator)): Use it.
* include/bits/stl_list.h (list<>::list(_InputIterator,
_InputIterator, const allocator_type&), list<>::assign(_InputIterator,
_InputIterator), list<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/stl_vector.h (vector<>::vector(_InputIterator,
_InputIterator, const allocator_type&), vector<>::assign(_InputIterator,
_InputIterator), vectort<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/stl_deque.h (deque<>::deque(_InputIterator,
_InputIterator, const allocator_type&), deque<>::deque(_InputIterator,
_InputIterator), deque<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/stl_bvector.h (vector<>::vector(_InputIterator,
_InputIterator, const allocator_type&), vector<>::deque(_InputIterator,
_InputIterator), vector<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/forward_list.h (forward_list<>::forward_list
(_InputIterator, _InputIterator, const allocator_type&),
forward_list<>::assign(_InputIterator, _InputIterator),
forward_list<>::insert_after(const_iterator, _InputIterator,
_InputIterator)): Likewise.
(forward_list<>::_M_initialize_dispatch(,, __true_type): Remove.
(forward_list<>::_M_range_initialize): Add, adjust everywhere.
* include/bits/forward_list.tcc: Adjust.
* include/debug/forward_list: Adjust.
* include/debug/vector: Likewise.
* include/debug/deque: Likewise.
* include/debug/list: Likewise.
* testsuite/ext/vstring/requirements/do_the_right_thing.cc: New.
* testsuite/23_containers/forward_list/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/vector/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/deque/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/list/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
assign_neg.cc: Adjust dg-error line number.
* testsuite/23_containers/forward_list/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
assign_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
assign_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
assign_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
Co-Authored-By: Jonathan Wakely <jwakely.gcc@gmail.com>
From-SVN: r184911
2012-03-05 02:15:28 +01:00
|
|
|
template<class _InputIterator,
|
|
|
|
typename = std::_RequireInputIter<_InputIterator>>
|
|
|
|
#else
|
2005-07-06 01:07:18 +02:00
|
|
|
template<class _InputIterator>
|
re PR libstdc++/43813 ([DR1234] vector<T*>(3, NULL) fails to compile)
2012-03-04 Paolo Carlini <paolo.carlini@oracle.com>
Jonathan Wakely <jwakely.gcc@gmail.com>
PR libstdc++/43813
* include/bits/stl_iterator_base_types.h (_RequireInputIter): New.
* include/ext/vstring.h (__versa_string<>::__versa_string
(_InputIterator, _InputIterator, const _Alloc&),
__versa_string<>::append(_InputIterator, _InputIterator),
__versa_string<>::assign(_InputIterator, _InputIterator),
__versa_string<>::insert(iterator, _InputIterator,
_InputIterator), __versa_string<>::replace(iterator, iterator,
_InputIterator, _InputIterator)): Use it.
* include/bits/stl_list.h (list<>::list(_InputIterator,
_InputIterator, const allocator_type&), list<>::assign(_InputIterator,
_InputIterator), list<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/stl_vector.h (vector<>::vector(_InputIterator,
_InputIterator, const allocator_type&), vector<>::assign(_InputIterator,
_InputIterator), vectort<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/stl_deque.h (deque<>::deque(_InputIterator,
_InputIterator, const allocator_type&), deque<>::deque(_InputIterator,
_InputIterator), deque<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/stl_bvector.h (vector<>::vector(_InputIterator,
_InputIterator, const allocator_type&), vector<>::deque(_InputIterator,
_InputIterator), vector<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/forward_list.h (forward_list<>::forward_list
(_InputIterator, _InputIterator, const allocator_type&),
forward_list<>::assign(_InputIterator, _InputIterator),
forward_list<>::insert_after(const_iterator, _InputIterator,
_InputIterator)): Likewise.
(forward_list<>::_M_initialize_dispatch(,, __true_type): Remove.
(forward_list<>::_M_range_initialize): Add, adjust everywhere.
* include/bits/forward_list.tcc: Adjust.
* include/debug/forward_list: Adjust.
* include/debug/vector: Likewise.
* include/debug/deque: Likewise.
* include/debug/list: Likewise.
* testsuite/ext/vstring/requirements/do_the_right_thing.cc: New.
* testsuite/23_containers/forward_list/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/vector/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/deque/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/list/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
assign_neg.cc: Adjust dg-error line number.
* testsuite/23_containers/forward_list/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
assign_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
assign_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
assign_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
Co-Authored-By: Jonathan Wakely <jwakely.gcc@gmail.com>
From-SVN: r184911
2012-03-05 02:15:28 +01:00
|
|
|
#endif
|
2005-07-06 01:07:18 +02:00
|
|
|
__versa_string&
|
|
|
|
append(_InputIterator __first, _InputIterator __last)
|
|
|
|
{ return this->replace(_M_iend(), _M_iend(), __first, __last); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Append a single character.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __c Character to append.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
void
|
|
|
|
push_back(_CharT __c)
|
|
|
|
{
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
const size_type __size = this->size();
|
|
|
|
if (__size + 1 > this->capacity() || this->_M_is_shared())
|
|
|
|
this->_M_mutate(__size, size_type(0), 0, size_type(1));
|
|
|
|
traits_type::assign(this->_M_data()[__size], __c);
|
|
|
|
this->_M_set_length(__size + 1);
|
2005-07-06 01:07:18 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Set value to contents of another string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __str Source string to use.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Reference to this string.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
assign(const __versa_string& __str)
|
|
|
|
{
|
|
|
|
this->_M_assign(__str);
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
2012-11-10 18:27:22 +01:00
|
|
|
#if __cplusplus >= 201103L
|
2010-01-10 14:38:47 +01:00
|
|
|
/**
|
|
|
|
* @brief Set value to contents of another string.
|
|
|
|
* @param __str Source string to use.
|
|
|
|
* @return Reference to this string.
|
|
|
|
*
|
|
|
|
* This function sets this string to the exact contents of @a __str.
|
|
|
|
* @a __str is a valid, but unspecified string.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
assign(__versa_string&& __str)
|
|
|
|
{
|
|
|
|
this->swap(__str);
|
|
|
|
return *this;
|
|
|
|
}
|
2012-11-10 18:27:22 +01:00
|
|
|
#endif // C++11
|
2010-01-10 14:38:47 +01:00
|
|
|
|
2005-07-06 01:07:18 +02:00
|
|
|
/**
|
|
|
|
* @brief Set value to a substring of a string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __str The string to use.
|
|
|
|
* @param __pos Index of the first character of str.
|
|
|
|
* @param __n Number of characters to use.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Reference to this string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @throw std::out_of_range if @a __pos is not a valid index.
|
2005-07-06 01:07:18 +02:00
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* This function sets this string to the substring of @a __str
|
|
|
|
* consisting of @a __n characters at @a __pos. If @a __n is
|
|
|
|
* is larger than the number of available characters in @a
|
|
|
|
* __str, the remainder of @a __str is used.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
assign(const __versa_string& __str, size_type __pos, size_type __n)
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
{ return _M_replace(size_type(0), this->size(), __str._M_data()
|
|
|
|
+ __str._M_check(__pos, "__versa_string::assign"),
|
|
|
|
__str._M_limit(__pos, __n)); }
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Set value to a C substring.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __s The C string to use.
|
|
|
|
* @param __n Number of characters to use.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Reference to this string.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* This function sets the value of this string to the first @a
|
|
|
|
* __n characters of @a __s. If @a __n is is larger than the
|
|
|
|
* number of available characters in @a __s, the remainder of
|
|
|
|
* @a __s is used.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
__versa_string&
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
assign(const _CharT* __s, size_type __n)
|
|
|
|
{
|
|
|
|
__glibcxx_requires_string_len(__s, __n);
|
|
|
|
return _M_replace(size_type(0), this->size(), __s, __n);
|
|
|
|
}
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Set value to contents of a C string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __s The C string to use.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Reference to this string.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* This function sets the value of this string to the value of
|
|
|
|
* @a __s. The data is copied, so there is no dependence on @a
|
|
|
|
* __s once the function returns.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
assign(const _CharT* __s)
|
|
|
|
{
|
|
|
|
__glibcxx_requires_string(__s);
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
return _M_replace(size_type(0), this->size(), __s,
|
|
|
|
traits_type::length(__s));
|
2005-07-06 01:07:18 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Set value to multiple characters.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __n Length of the resulting string.
|
|
|
|
* @param __c The character to use.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Reference to this string.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* This function sets the value of this string to @a __n copies of
|
|
|
|
* character @a __c.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
assign(size_type __n, _CharT __c)
|
|
|
|
{ return _M_replace_aux(size_type(0), this->size(), __n, __c); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Set value to a range of characters.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __first Iterator referencing the first character to append.
|
|
|
|
* @param __last Iterator marking the end of the range.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Reference to this string.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Sets value of string to characters in the range
|
|
|
|
* [first,last).
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
2012-11-10 18:27:22 +01:00
|
|
|
#if __cplusplus >= 201103L
|
re PR libstdc++/43813 ([DR1234] vector<T*>(3, NULL) fails to compile)
2012-03-04 Paolo Carlini <paolo.carlini@oracle.com>
Jonathan Wakely <jwakely.gcc@gmail.com>
PR libstdc++/43813
* include/bits/stl_iterator_base_types.h (_RequireInputIter): New.
* include/ext/vstring.h (__versa_string<>::__versa_string
(_InputIterator, _InputIterator, const _Alloc&),
__versa_string<>::append(_InputIterator, _InputIterator),
__versa_string<>::assign(_InputIterator, _InputIterator),
__versa_string<>::insert(iterator, _InputIterator,
_InputIterator), __versa_string<>::replace(iterator, iterator,
_InputIterator, _InputIterator)): Use it.
* include/bits/stl_list.h (list<>::list(_InputIterator,
_InputIterator, const allocator_type&), list<>::assign(_InputIterator,
_InputIterator), list<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/stl_vector.h (vector<>::vector(_InputIterator,
_InputIterator, const allocator_type&), vector<>::assign(_InputIterator,
_InputIterator), vectort<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/stl_deque.h (deque<>::deque(_InputIterator,
_InputIterator, const allocator_type&), deque<>::deque(_InputIterator,
_InputIterator), deque<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/stl_bvector.h (vector<>::vector(_InputIterator,
_InputIterator, const allocator_type&), vector<>::deque(_InputIterator,
_InputIterator), vector<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/forward_list.h (forward_list<>::forward_list
(_InputIterator, _InputIterator, const allocator_type&),
forward_list<>::assign(_InputIterator, _InputIterator),
forward_list<>::insert_after(const_iterator, _InputIterator,
_InputIterator)): Likewise.
(forward_list<>::_M_initialize_dispatch(,, __true_type): Remove.
(forward_list<>::_M_range_initialize): Add, adjust everywhere.
* include/bits/forward_list.tcc: Adjust.
* include/debug/forward_list: Adjust.
* include/debug/vector: Likewise.
* include/debug/deque: Likewise.
* include/debug/list: Likewise.
* testsuite/ext/vstring/requirements/do_the_right_thing.cc: New.
* testsuite/23_containers/forward_list/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/vector/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/deque/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/list/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
assign_neg.cc: Adjust dg-error line number.
* testsuite/23_containers/forward_list/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
assign_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
assign_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
assign_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
Co-Authored-By: Jonathan Wakely <jwakely.gcc@gmail.com>
From-SVN: r184911
2012-03-05 02:15:28 +01:00
|
|
|
template<class _InputIterator,
|
|
|
|
typename = std::_RequireInputIter<_InputIterator>>
|
|
|
|
#else
|
2005-07-06 01:07:18 +02:00
|
|
|
template<class _InputIterator>
|
re PR libstdc++/43813 ([DR1234] vector<T*>(3, NULL) fails to compile)
2012-03-04 Paolo Carlini <paolo.carlini@oracle.com>
Jonathan Wakely <jwakely.gcc@gmail.com>
PR libstdc++/43813
* include/bits/stl_iterator_base_types.h (_RequireInputIter): New.
* include/ext/vstring.h (__versa_string<>::__versa_string
(_InputIterator, _InputIterator, const _Alloc&),
__versa_string<>::append(_InputIterator, _InputIterator),
__versa_string<>::assign(_InputIterator, _InputIterator),
__versa_string<>::insert(iterator, _InputIterator,
_InputIterator), __versa_string<>::replace(iterator, iterator,
_InputIterator, _InputIterator)): Use it.
* include/bits/stl_list.h (list<>::list(_InputIterator,
_InputIterator, const allocator_type&), list<>::assign(_InputIterator,
_InputIterator), list<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/stl_vector.h (vector<>::vector(_InputIterator,
_InputIterator, const allocator_type&), vector<>::assign(_InputIterator,
_InputIterator), vectort<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/stl_deque.h (deque<>::deque(_InputIterator,
_InputIterator, const allocator_type&), deque<>::deque(_InputIterator,
_InputIterator), deque<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/stl_bvector.h (vector<>::vector(_InputIterator,
_InputIterator, const allocator_type&), vector<>::deque(_InputIterator,
_InputIterator), vector<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/forward_list.h (forward_list<>::forward_list
(_InputIterator, _InputIterator, const allocator_type&),
forward_list<>::assign(_InputIterator, _InputIterator),
forward_list<>::insert_after(const_iterator, _InputIterator,
_InputIterator)): Likewise.
(forward_list<>::_M_initialize_dispatch(,, __true_type): Remove.
(forward_list<>::_M_range_initialize): Add, adjust everywhere.
* include/bits/forward_list.tcc: Adjust.
* include/debug/forward_list: Adjust.
* include/debug/vector: Likewise.
* include/debug/deque: Likewise.
* include/debug/list: Likewise.
* testsuite/ext/vstring/requirements/do_the_right_thing.cc: New.
* testsuite/23_containers/forward_list/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/vector/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/deque/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/list/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
assign_neg.cc: Adjust dg-error line number.
* testsuite/23_containers/forward_list/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
assign_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
assign_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
assign_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
Co-Authored-By: Jonathan Wakely <jwakely.gcc@gmail.com>
From-SVN: r184911
2012-03-05 02:15:28 +01:00
|
|
|
#endif
|
2005-07-06 01:07:18 +02:00
|
|
|
__versa_string&
|
|
|
|
assign(_InputIterator __first, _InputIterator __last)
|
|
|
|
{ return this->replace(_M_ibegin(), _M_iend(), __first, __last); }
|
|
|
|
|
2012-11-10 18:27:22 +01:00
|
|
|
#if __cplusplus >= 201103L
|
2008-07-21 21:40:39 +02:00
|
|
|
/**
|
|
|
|
* @brief Set value to an initializer_list of characters.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __l The initializer_list of characters to assign.
|
2008-07-21 21:40:39 +02:00
|
|
|
* @return Reference to this string.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
assign(std::initializer_list<_CharT> __l)
|
|
|
|
{ return this->assign(__l.begin(), __l.end()); }
|
2012-11-10 18:27:22 +01:00
|
|
|
#endif // C++11
|
2008-07-21 21:40:39 +02:00
|
|
|
|
stl_list.h (list<>::insert(iterator, size_type, const value_type&), [...]): Adjust C++11 signatures to take const_iterator(s).
2013-07-01 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/stl_list.h (list<>::insert(iterator,
size_type, const value_type&), list<>::insert(iterator,
initializer_list<>), list<>::insert(iterator, _InputIterator,
_InputIterator), list<>::splice(iterator, list&&),
list<>::splice(iterator, list&), list<>::splice(iterator, list&&,
iterator), list<>::splice(iterator, list&, iterator),
list<>::splice(iterator, list&&, iterator, iterator),
list<>::splice(iterator, list&, iterator, iterator)): Adjust C++11
signatures to take const_iterator(s).
* include/bits/list.tcc (list<>::insert(const_iterator, size_type,
const value_type&), list<>::insert(const_iterator, _InputIterator,
_InputIterator)): Define.
* include/ext/vstring.h (__versa_string<>::insert(iterator,
size_type, _CharT), __versa_string<>::insert(iterator,
_InputIterator, _InputIterator), __versa_string<>::insert(iterator,
std::initializer_list<>), __versa_string<>::replace(iterator,
iterator, _InputIterator, _InputIterator), __versa_string<>::
replace(iterator, iterator, std::initializer_list<>)): Adjust C++11
signatures to take const_iterator(s).
(__versa_string<>::_M_replace_dispatch): Take const_iterators.
* include/ext/vstring.tcc: Likewise.
* include/debug/list: Adjust.
* include/profile/list: Likewise.
* testsuite/23_containers/list/operations/splice/const_iterator.cc:
New.
* testsuite/23_containers/list/modifiers/insert/const_iterator.cc:
Extend.
* testsuite/ext/vstring/modifiers/insert/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/insert/wchar_t/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/wchar_t/const_iterator.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Adjust dg-error line number.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Likewise.
From-SVN: r200580
2013-07-01 18:17:46 +02:00
|
|
|
#if __cplusplus >= 201103L
|
|
|
|
/**
|
|
|
|
* @brief Insert multiple characters.
|
|
|
|
* @param __p Const_iterator referencing location in string to
|
|
|
|
* insert at.
|
|
|
|
* @param __n Number of characters to insert
|
|
|
|
* @param __c The character to insert.
|
|
|
|
* @return Iterator referencing the first inserted char.
|
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
|
|
|
*
|
|
|
|
* Inserts @a __n copies of character @a __c starting at the
|
|
|
|
* position referenced by iterator @a __p. If adding
|
|
|
|
* characters causes the length to exceed max_size(),
|
|
|
|
* length_error is thrown. The value of the string doesn't
|
|
|
|
* change if an error is thrown.
|
|
|
|
*/
|
|
|
|
iterator
|
|
|
|
insert(const_iterator __p, size_type __n, _CharT __c)
|
|
|
|
{
|
|
|
|
_GLIBCXX_DEBUG_PEDASSERT(__p >= _M_ibegin() && __p <= _M_iend());
|
|
|
|
const size_type __pos = __p - _M_ibegin();
|
|
|
|
this->replace(__p, __p, __n, __c);
|
|
|
|
return iterator(this->_M_data() + __pos);
|
|
|
|
}
|
|
|
|
#else
|
2005-07-06 01:07:18 +02:00
|
|
|
/**
|
|
|
|
* @brief Insert multiple characters.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __p Iterator referencing location in string to insert at.
|
|
|
|
* @param __n Number of characters to insert
|
|
|
|
* @param __c The character to insert.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Inserts @a __n copies of character @a __c starting at the
|
|
|
|
* position referenced by iterator @a __p. If adding
|
|
|
|
* characters causes the length to exceed max_size(),
|
|
|
|
* length_error is thrown. The value of the string doesn't
|
|
|
|
* change if an error is thrown.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
void
|
|
|
|
insert(iterator __p, size_type __n, _CharT __c)
|
|
|
|
{ this->replace(__p, __p, __n, __c); }
|
stl_list.h (list<>::insert(iterator, size_type, const value_type&), [...]): Adjust C++11 signatures to take const_iterator(s).
2013-07-01 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/stl_list.h (list<>::insert(iterator,
size_type, const value_type&), list<>::insert(iterator,
initializer_list<>), list<>::insert(iterator, _InputIterator,
_InputIterator), list<>::splice(iterator, list&&),
list<>::splice(iterator, list&), list<>::splice(iterator, list&&,
iterator), list<>::splice(iterator, list&, iterator),
list<>::splice(iterator, list&&, iterator, iterator),
list<>::splice(iterator, list&, iterator, iterator)): Adjust C++11
signatures to take const_iterator(s).
* include/bits/list.tcc (list<>::insert(const_iterator, size_type,
const value_type&), list<>::insert(const_iterator, _InputIterator,
_InputIterator)): Define.
* include/ext/vstring.h (__versa_string<>::insert(iterator,
size_type, _CharT), __versa_string<>::insert(iterator,
_InputIterator, _InputIterator), __versa_string<>::insert(iterator,
std::initializer_list<>), __versa_string<>::replace(iterator,
iterator, _InputIterator, _InputIterator), __versa_string<>::
replace(iterator, iterator, std::initializer_list<>)): Adjust C++11
signatures to take const_iterator(s).
(__versa_string<>::_M_replace_dispatch): Take const_iterators.
* include/ext/vstring.tcc: Likewise.
* include/debug/list: Adjust.
* include/profile/list: Likewise.
* testsuite/23_containers/list/operations/splice/const_iterator.cc:
New.
* testsuite/23_containers/list/modifiers/insert/const_iterator.cc:
Extend.
* testsuite/ext/vstring/modifiers/insert/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/insert/wchar_t/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/wchar_t/const_iterator.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Adjust dg-error line number.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Likewise.
From-SVN: r200580
2013-07-01 18:17:46 +02:00
|
|
|
#endif
|
2005-07-06 01:07:18 +02:00
|
|
|
|
stl_list.h (list<>::insert(iterator, size_type, const value_type&), [...]): Adjust C++11 signatures to take const_iterator(s).
2013-07-01 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/stl_list.h (list<>::insert(iterator,
size_type, const value_type&), list<>::insert(iterator,
initializer_list<>), list<>::insert(iterator, _InputIterator,
_InputIterator), list<>::splice(iterator, list&&),
list<>::splice(iterator, list&), list<>::splice(iterator, list&&,
iterator), list<>::splice(iterator, list&, iterator),
list<>::splice(iterator, list&&, iterator, iterator),
list<>::splice(iterator, list&, iterator, iterator)): Adjust C++11
signatures to take const_iterator(s).
* include/bits/list.tcc (list<>::insert(const_iterator, size_type,
const value_type&), list<>::insert(const_iterator, _InputIterator,
_InputIterator)): Define.
* include/ext/vstring.h (__versa_string<>::insert(iterator,
size_type, _CharT), __versa_string<>::insert(iterator,
_InputIterator, _InputIterator), __versa_string<>::insert(iterator,
std::initializer_list<>), __versa_string<>::replace(iterator,
iterator, _InputIterator, _InputIterator), __versa_string<>::
replace(iterator, iterator, std::initializer_list<>)): Adjust C++11
signatures to take const_iterator(s).
(__versa_string<>::_M_replace_dispatch): Take const_iterators.
* include/ext/vstring.tcc: Likewise.
* include/debug/list: Adjust.
* include/profile/list: Likewise.
* testsuite/23_containers/list/operations/splice/const_iterator.cc:
New.
* testsuite/23_containers/list/modifiers/insert/const_iterator.cc:
Extend.
* testsuite/ext/vstring/modifiers/insert/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/insert/wchar_t/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/wchar_t/const_iterator.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Adjust dg-error line number.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Likewise.
From-SVN: r200580
2013-07-01 18:17:46 +02:00
|
|
|
#if __cplusplus >= 201103L
|
2005-07-06 01:07:18 +02:00
|
|
|
/**
|
|
|
|
* @brief Insert a range of characters.
|
stl_list.h (list<>::insert(iterator, size_type, const value_type&), [...]): Adjust C++11 signatures to take const_iterator(s).
2013-07-01 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/stl_list.h (list<>::insert(iterator,
size_type, const value_type&), list<>::insert(iterator,
initializer_list<>), list<>::insert(iterator, _InputIterator,
_InputIterator), list<>::splice(iterator, list&&),
list<>::splice(iterator, list&), list<>::splice(iterator, list&&,
iterator), list<>::splice(iterator, list&, iterator),
list<>::splice(iterator, list&&, iterator, iterator),
list<>::splice(iterator, list&, iterator, iterator)): Adjust C++11
signatures to take const_iterator(s).
* include/bits/list.tcc (list<>::insert(const_iterator, size_type,
const value_type&), list<>::insert(const_iterator, _InputIterator,
_InputIterator)): Define.
* include/ext/vstring.h (__versa_string<>::insert(iterator,
size_type, _CharT), __versa_string<>::insert(iterator,
_InputIterator, _InputIterator), __versa_string<>::insert(iterator,
std::initializer_list<>), __versa_string<>::replace(iterator,
iterator, _InputIterator, _InputIterator), __versa_string<>::
replace(iterator, iterator, std::initializer_list<>)): Adjust C++11
signatures to take const_iterator(s).
(__versa_string<>::_M_replace_dispatch): Take const_iterators.
* include/ext/vstring.tcc: Likewise.
* include/debug/list: Adjust.
* include/profile/list: Likewise.
* testsuite/23_containers/list/operations/splice/const_iterator.cc:
New.
* testsuite/23_containers/list/modifiers/insert/const_iterator.cc:
Extend.
* testsuite/ext/vstring/modifiers/insert/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/insert/wchar_t/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/wchar_t/const_iterator.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Adjust dg-error line number.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Likewise.
From-SVN: r200580
2013-07-01 18:17:46 +02:00
|
|
|
* @param __p Const_iterator referencing location in string to
|
|
|
|
* insert at.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __beg Start of range.
|
|
|
|
* @param __end End of range.
|
stl_list.h (list<>::insert(iterator, size_type, const value_type&), [...]): Adjust C++11 signatures to take const_iterator(s).
2013-07-01 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/stl_list.h (list<>::insert(iterator,
size_type, const value_type&), list<>::insert(iterator,
initializer_list<>), list<>::insert(iterator, _InputIterator,
_InputIterator), list<>::splice(iterator, list&&),
list<>::splice(iterator, list&), list<>::splice(iterator, list&&,
iterator), list<>::splice(iterator, list&, iterator),
list<>::splice(iterator, list&&, iterator, iterator),
list<>::splice(iterator, list&, iterator, iterator)): Adjust C++11
signatures to take const_iterator(s).
* include/bits/list.tcc (list<>::insert(const_iterator, size_type,
const value_type&), list<>::insert(const_iterator, _InputIterator,
_InputIterator)): Define.
* include/ext/vstring.h (__versa_string<>::insert(iterator,
size_type, _CharT), __versa_string<>::insert(iterator,
_InputIterator, _InputIterator), __versa_string<>::insert(iterator,
std::initializer_list<>), __versa_string<>::replace(iterator,
iterator, _InputIterator, _InputIterator), __versa_string<>::
replace(iterator, iterator, std::initializer_list<>)): Adjust C++11
signatures to take const_iterator(s).
(__versa_string<>::_M_replace_dispatch): Take const_iterators.
* include/ext/vstring.tcc: Likewise.
* include/debug/list: Adjust.
* include/profile/list: Likewise.
* testsuite/23_containers/list/operations/splice/const_iterator.cc:
New.
* testsuite/23_containers/list/modifiers/insert/const_iterator.cc:
Extend.
* testsuite/ext/vstring/modifiers/insert/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/insert/wchar_t/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/wchar_t/const_iterator.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Adjust dg-error line number.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Likewise.
From-SVN: r200580
2013-07-01 18:17:46 +02:00
|
|
|
* @return Iterator referencing the first inserted char.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Inserts characters in range [beg,end). If adding characters
|
|
|
|
* causes the length to exceed max_size(), length_error is
|
|
|
|
* thrown. The value of the string doesn't change if an error
|
|
|
|
* is thrown.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
re PR libstdc++/43813 ([DR1234] vector<T*>(3, NULL) fails to compile)
2012-03-04 Paolo Carlini <paolo.carlini@oracle.com>
Jonathan Wakely <jwakely.gcc@gmail.com>
PR libstdc++/43813
* include/bits/stl_iterator_base_types.h (_RequireInputIter): New.
* include/ext/vstring.h (__versa_string<>::__versa_string
(_InputIterator, _InputIterator, const _Alloc&),
__versa_string<>::append(_InputIterator, _InputIterator),
__versa_string<>::assign(_InputIterator, _InputIterator),
__versa_string<>::insert(iterator, _InputIterator,
_InputIterator), __versa_string<>::replace(iterator, iterator,
_InputIterator, _InputIterator)): Use it.
* include/bits/stl_list.h (list<>::list(_InputIterator,
_InputIterator, const allocator_type&), list<>::assign(_InputIterator,
_InputIterator), list<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/stl_vector.h (vector<>::vector(_InputIterator,
_InputIterator, const allocator_type&), vector<>::assign(_InputIterator,
_InputIterator), vectort<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/stl_deque.h (deque<>::deque(_InputIterator,
_InputIterator, const allocator_type&), deque<>::deque(_InputIterator,
_InputIterator), deque<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/stl_bvector.h (vector<>::vector(_InputIterator,
_InputIterator, const allocator_type&), vector<>::deque(_InputIterator,
_InputIterator), vector<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/forward_list.h (forward_list<>::forward_list
(_InputIterator, _InputIterator, const allocator_type&),
forward_list<>::assign(_InputIterator, _InputIterator),
forward_list<>::insert_after(const_iterator, _InputIterator,
_InputIterator)): Likewise.
(forward_list<>::_M_initialize_dispatch(,, __true_type): Remove.
(forward_list<>::_M_range_initialize): Add, adjust everywhere.
* include/bits/forward_list.tcc: Adjust.
* include/debug/forward_list: Adjust.
* include/debug/vector: Likewise.
* include/debug/deque: Likewise.
* include/debug/list: Likewise.
* testsuite/ext/vstring/requirements/do_the_right_thing.cc: New.
* testsuite/23_containers/forward_list/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/vector/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/deque/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/list/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
assign_neg.cc: Adjust dg-error line number.
* testsuite/23_containers/forward_list/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
assign_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
assign_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
assign_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
Co-Authored-By: Jonathan Wakely <jwakely.gcc@gmail.com>
From-SVN: r184911
2012-03-05 02:15:28 +01:00
|
|
|
template<class _InputIterator,
|
|
|
|
typename = std::_RequireInputIter<_InputIterator>>
|
stl_list.h (list<>::insert(iterator, size_type, const value_type&), [...]): Adjust C++11 signatures to take const_iterator(s).
2013-07-01 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/stl_list.h (list<>::insert(iterator,
size_type, const value_type&), list<>::insert(iterator,
initializer_list<>), list<>::insert(iterator, _InputIterator,
_InputIterator), list<>::splice(iterator, list&&),
list<>::splice(iterator, list&), list<>::splice(iterator, list&&,
iterator), list<>::splice(iterator, list&, iterator),
list<>::splice(iterator, list&&, iterator, iterator),
list<>::splice(iterator, list&, iterator, iterator)): Adjust C++11
signatures to take const_iterator(s).
* include/bits/list.tcc (list<>::insert(const_iterator, size_type,
const value_type&), list<>::insert(const_iterator, _InputIterator,
_InputIterator)): Define.
* include/ext/vstring.h (__versa_string<>::insert(iterator,
size_type, _CharT), __versa_string<>::insert(iterator,
_InputIterator, _InputIterator), __versa_string<>::insert(iterator,
std::initializer_list<>), __versa_string<>::replace(iterator,
iterator, _InputIterator, _InputIterator), __versa_string<>::
replace(iterator, iterator, std::initializer_list<>)): Adjust C++11
signatures to take const_iterator(s).
(__versa_string<>::_M_replace_dispatch): Take const_iterators.
* include/ext/vstring.tcc: Likewise.
* include/debug/list: Adjust.
* include/profile/list: Likewise.
* testsuite/23_containers/list/operations/splice/const_iterator.cc:
New.
* testsuite/23_containers/list/modifiers/insert/const_iterator.cc:
Extend.
* testsuite/ext/vstring/modifiers/insert/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/insert/wchar_t/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/wchar_t/const_iterator.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Adjust dg-error line number.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Likewise.
From-SVN: r200580
2013-07-01 18:17:46 +02:00
|
|
|
iterator
|
|
|
|
insert(const_iterator __p, _InputIterator __beg, _InputIterator __end)
|
|
|
|
{
|
|
|
|
_GLIBCXX_DEBUG_PEDASSERT(__p >= _M_ibegin() && __p <= _M_iend());
|
|
|
|
const size_type __pos = __p - _M_ibegin();
|
|
|
|
this->replace(__p, __p, __beg, __end);
|
|
|
|
return iterator(this->_M_data() + __pos);
|
|
|
|
}
|
re PR libstdc++/43813 ([DR1234] vector<T*>(3, NULL) fails to compile)
2012-03-04 Paolo Carlini <paolo.carlini@oracle.com>
Jonathan Wakely <jwakely.gcc@gmail.com>
PR libstdc++/43813
* include/bits/stl_iterator_base_types.h (_RequireInputIter): New.
* include/ext/vstring.h (__versa_string<>::__versa_string
(_InputIterator, _InputIterator, const _Alloc&),
__versa_string<>::append(_InputIterator, _InputIterator),
__versa_string<>::assign(_InputIterator, _InputIterator),
__versa_string<>::insert(iterator, _InputIterator,
_InputIterator), __versa_string<>::replace(iterator, iterator,
_InputIterator, _InputIterator)): Use it.
* include/bits/stl_list.h (list<>::list(_InputIterator,
_InputIterator, const allocator_type&), list<>::assign(_InputIterator,
_InputIterator), list<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/stl_vector.h (vector<>::vector(_InputIterator,
_InputIterator, const allocator_type&), vector<>::assign(_InputIterator,
_InputIterator), vectort<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/stl_deque.h (deque<>::deque(_InputIterator,
_InputIterator, const allocator_type&), deque<>::deque(_InputIterator,
_InputIterator), deque<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/stl_bvector.h (vector<>::vector(_InputIterator,
_InputIterator, const allocator_type&), vector<>::deque(_InputIterator,
_InputIterator), vector<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/forward_list.h (forward_list<>::forward_list
(_InputIterator, _InputIterator, const allocator_type&),
forward_list<>::assign(_InputIterator, _InputIterator),
forward_list<>::insert_after(const_iterator, _InputIterator,
_InputIterator)): Likewise.
(forward_list<>::_M_initialize_dispatch(,, __true_type): Remove.
(forward_list<>::_M_range_initialize): Add, adjust everywhere.
* include/bits/forward_list.tcc: Adjust.
* include/debug/forward_list: Adjust.
* include/debug/vector: Likewise.
* include/debug/deque: Likewise.
* include/debug/list: Likewise.
* testsuite/ext/vstring/requirements/do_the_right_thing.cc: New.
* testsuite/23_containers/forward_list/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/vector/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/deque/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/list/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
assign_neg.cc: Adjust dg-error line number.
* testsuite/23_containers/forward_list/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
assign_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
assign_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
assign_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
Co-Authored-By: Jonathan Wakely <jwakely.gcc@gmail.com>
From-SVN: r184911
2012-03-05 02:15:28 +01:00
|
|
|
#else
|
stl_list.h (list<>::insert(iterator, size_type, const value_type&), [...]): Adjust C++11 signatures to take const_iterator(s).
2013-07-01 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/stl_list.h (list<>::insert(iterator,
size_type, const value_type&), list<>::insert(iterator,
initializer_list<>), list<>::insert(iterator, _InputIterator,
_InputIterator), list<>::splice(iterator, list&&),
list<>::splice(iterator, list&), list<>::splice(iterator, list&&,
iterator), list<>::splice(iterator, list&, iterator),
list<>::splice(iterator, list&&, iterator, iterator),
list<>::splice(iterator, list&, iterator, iterator)): Adjust C++11
signatures to take const_iterator(s).
* include/bits/list.tcc (list<>::insert(const_iterator, size_type,
const value_type&), list<>::insert(const_iterator, _InputIterator,
_InputIterator)): Define.
* include/ext/vstring.h (__versa_string<>::insert(iterator,
size_type, _CharT), __versa_string<>::insert(iterator,
_InputIterator, _InputIterator), __versa_string<>::insert(iterator,
std::initializer_list<>), __versa_string<>::replace(iterator,
iterator, _InputIterator, _InputIterator), __versa_string<>::
replace(iterator, iterator, std::initializer_list<>)): Adjust C++11
signatures to take const_iterator(s).
(__versa_string<>::_M_replace_dispatch): Take const_iterators.
* include/ext/vstring.tcc: Likewise.
* include/debug/list: Adjust.
* include/profile/list: Likewise.
* testsuite/23_containers/list/operations/splice/const_iterator.cc:
New.
* testsuite/23_containers/list/modifiers/insert/const_iterator.cc:
Extend.
* testsuite/ext/vstring/modifiers/insert/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/insert/wchar_t/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/wchar_t/const_iterator.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Adjust dg-error line number.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Likewise.
From-SVN: r200580
2013-07-01 18:17:46 +02:00
|
|
|
/**
|
|
|
|
* @brief Insert a range of characters.
|
|
|
|
* @param __p Iterator referencing location in string to insert at.
|
|
|
|
* @param __beg Start of range.
|
|
|
|
* @param __end End of range.
|
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
|
|
|
*
|
|
|
|
* Inserts characters in range [beg,end). If adding characters
|
|
|
|
* causes the length to exceed max_size(), length_error is
|
|
|
|
* thrown. The value of the string doesn't change if an error
|
|
|
|
* is thrown.
|
|
|
|
*/
|
2005-07-06 01:07:18 +02:00
|
|
|
template<class _InputIterator>
|
|
|
|
void
|
|
|
|
insert(iterator __p, _InputIterator __beg, _InputIterator __end)
|
|
|
|
{ this->replace(__p, __p, __beg, __end); }
|
stl_list.h (list<>::insert(iterator, size_type, const value_type&), [...]): Adjust C++11 signatures to take const_iterator(s).
2013-07-01 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/stl_list.h (list<>::insert(iterator,
size_type, const value_type&), list<>::insert(iterator,
initializer_list<>), list<>::insert(iterator, _InputIterator,
_InputIterator), list<>::splice(iterator, list&&),
list<>::splice(iterator, list&), list<>::splice(iterator, list&&,
iterator), list<>::splice(iterator, list&, iterator),
list<>::splice(iterator, list&&, iterator, iterator),
list<>::splice(iterator, list&, iterator, iterator)): Adjust C++11
signatures to take const_iterator(s).
* include/bits/list.tcc (list<>::insert(const_iterator, size_type,
const value_type&), list<>::insert(const_iterator, _InputIterator,
_InputIterator)): Define.
* include/ext/vstring.h (__versa_string<>::insert(iterator,
size_type, _CharT), __versa_string<>::insert(iterator,
_InputIterator, _InputIterator), __versa_string<>::insert(iterator,
std::initializer_list<>), __versa_string<>::replace(iterator,
iterator, _InputIterator, _InputIterator), __versa_string<>::
replace(iterator, iterator, std::initializer_list<>)): Adjust C++11
signatures to take const_iterator(s).
(__versa_string<>::_M_replace_dispatch): Take const_iterators.
* include/ext/vstring.tcc: Likewise.
* include/debug/list: Adjust.
* include/profile/list: Likewise.
* testsuite/23_containers/list/operations/splice/const_iterator.cc:
New.
* testsuite/23_containers/list/modifiers/insert/const_iterator.cc:
Extend.
* testsuite/ext/vstring/modifiers/insert/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/insert/wchar_t/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/wchar_t/const_iterator.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Adjust dg-error line number.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Likewise.
From-SVN: r200580
2013-07-01 18:17:46 +02:00
|
|
|
#endif
|
2005-07-06 01:07:18 +02:00
|
|
|
|
2012-11-10 18:27:22 +01:00
|
|
|
#if __cplusplus >= 201103L
|
2008-07-21 21:40:39 +02:00
|
|
|
/**
|
|
|
|
* @brief Insert an initializer_list of characters.
|
stl_list.h (list<>::insert(iterator, size_type, const value_type&), [...]): Adjust C++11 signatures to take const_iterator(s).
2013-07-01 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/stl_list.h (list<>::insert(iterator,
size_type, const value_type&), list<>::insert(iterator,
initializer_list<>), list<>::insert(iterator, _InputIterator,
_InputIterator), list<>::splice(iterator, list&&),
list<>::splice(iterator, list&), list<>::splice(iterator, list&&,
iterator), list<>::splice(iterator, list&, iterator),
list<>::splice(iterator, list&&, iterator, iterator),
list<>::splice(iterator, list&, iterator, iterator)): Adjust C++11
signatures to take const_iterator(s).
* include/bits/list.tcc (list<>::insert(const_iterator, size_type,
const value_type&), list<>::insert(const_iterator, _InputIterator,
_InputIterator)): Define.
* include/ext/vstring.h (__versa_string<>::insert(iterator,
size_type, _CharT), __versa_string<>::insert(iterator,
_InputIterator, _InputIterator), __versa_string<>::insert(iterator,
std::initializer_list<>), __versa_string<>::replace(iterator,
iterator, _InputIterator, _InputIterator), __versa_string<>::
replace(iterator, iterator, std::initializer_list<>)): Adjust C++11
signatures to take const_iterator(s).
(__versa_string<>::_M_replace_dispatch): Take const_iterators.
* include/ext/vstring.tcc: Likewise.
* include/debug/list: Adjust.
* include/profile/list: Likewise.
* testsuite/23_containers/list/operations/splice/const_iterator.cc:
New.
* testsuite/23_containers/list/modifiers/insert/const_iterator.cc:
Extend.
* testsuite/ext/vstring/modifiers/insert/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/insert/wchar_t/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/wchar_t/const_iterator.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Adjust dg-error line number.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Likewise.
From-SVN: r200580
2013-07-01 18:17:46 +02:00
|
|
|
* @param __p Const_iterator referencing location in string to
|
|
|
|
* insert at.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __l The initializer_list of characters to insert.
|
stl_list.h (list<>::insert(iterator, size_type, const value_type&), [...]): Adjust C++11 signatures to take const_iterator(s).
2013-07-01 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/stl_list.h (list<>::insert(iterator,
size_type, const value_type&), list<>::insert(iterator,
initializer_list<>), list<>::insert(iterator, _InputIterator,
_InputIterator), list<>::splice(iterator, list&&),
list<>::splice(iterator, list&), list<>::splice(iterator, list&&,
iterator), list<>::splice(iterator, list&, iterator),
list<>::splice(iterator, list&&, iterator, iterator),
list<>::splice(iterator, list&, iterator, iterator)): Adjust C++11
signatures to take const_iterator(s).
* include/bits/list.tcc (list<>::insert(const_iterator, size_type,
const value_type&), list<>::insert(const_iterator, _InputIterator,
_InputIterator)): Define.
* include/ext/vstring.h (__versa_string<>::insert(iterator,
size_type, _CharT), __versa_string<>::insert(iterator,
_InputIterator, _InputIterator), __versa_string<>::insert(iterator,
std::initializer_list<>), __versa_string<>::replace(iterator,
iterator, _InputIterator, _InputIterator), __versa_string<>::
replace(iterator, iterator, std::initializer_list<>)): Adjust C++11
signatures to take const_iterator(s).
(__versa_string<>::_M_replace_dispatch): Take const_iterators.
* include/ext/vstring.tcc: Likewise.
* include/debug/list: Adjust.
* include/profile/list: Likewise.
* testsuite/23_containers/list/operations/splice/const_iterator.cc:
New.
* testsuite/23_containers/list/modifiers/insert/const_iterator.cc:
Extend.
* testsuite/ext/vstring/modifiers/insert/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/insert/wchar_t/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/wchar_t/const_iterator.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Adjust dg-error line number.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Likewise.
From-SVN: r200580
2013-07-01 18:17:46 +02:00
|
|
|
* @return Iterator referencing the first inserted char.
|
2008-07-21 21:40:39 +02:00
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
|
|
|
*/
|
stl_list.h (list<>::insert(iterator, size_type, const value_type&), [...]): Adjust C++11 signatures to take const_iterator(s).
2013-07-01 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/stl_list.h (list<>::insert(iterator,
size_type, const value_type&), list<>::insert(iterator,
initializer_list<>), list<>::insert(iterator, _InputIterator,
_InputIterator), list<>::splice(iterator, list&&),
list<>::splice(iterator, list&), list<>::splice(iterator, list&&,
iterator), list<>::splice(iterator, list&, iterator),
list<>::splice(iterator, list&&, iterator, iterator),
list<>::splice(iterator, list&, iterator, iterator)): Adjust C++11
signatures to take const_iterator(s).
* include/bits/list.tcc (list<>::insert(const_iterator, size_type,
const value_type&), list<>::insert(const_iterator, _InputIterator,
_InputIterator)): Define.
* include/ext/vstring.h (__versa_string<>::insert(iterator,
size_type, _CharT), __versa_string<>::insert(iterator,
_InputIterator, _InputIterator), __versa_string<>::insert(iterator,
std::initializer_list<>), __versa_string<>::replace(iterator,
iterator, _InputIterator, _InputIterator), __versa_string<>::
replace(iterator, iterator, std::initializer_list<>)): Adjust C++11
signatures to take const_iterator(s).
(__versa_string<>::_M_replace_dispatch): Take const_iterators.
* include/ext/vstring.tcc: Likewise.
* include/debug/list: Adjust.
* include/profile/list: Likewise.
* testsuite/23_containers/list/operations/splice/const_iterator.cc:
New.
* testsuite/23_containers/list/modifiers/insert/const_iterator.cc:
Extend.
* testsuite/ext/vstring/modifiers/insert/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/insert/wchar_t/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/wchar_t/const_iterator.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Adjust dg-error line number.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Likewise.
From-SVN: r200580
2013-07-01 18:17:46 +02:00
|
|
|
iterator
|
|
|
|
insert(const_iterator __p, std::initializer_list<_CharT> __l)
|
|
|
|
{ return this->insert(__p, __l.begin(), __l.end()); }
|
2012-11-10 18:27:22 +01:00
|
|
|
#endif // C++11
|
2008-07-21 21:40:39 +02:00
|
|
|
|
2005-07-06 01:07:18 +02:00
|
|
|
/**
|
|
|
|
* @brief Insert value of a string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __pos1 Iterator referencing location in string to insert at.
|
|
|
|
* @param __str The string to insert.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Reference to this string.
|
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Inserts value of @a __str starting at @a __pos1. If adding
|
|
|
|
* characters causes the length to exceed max_size(),
|
|
|
|
* length_error is thrown. The value of the string doesn't
|
|
|
|
* change if an error is thrown.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
insert(size_type __pos1, const __versa_string& __str)
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
{ return this->replace(__pos1, size_type(0),
|
|
|
|
__str._M_data(), __str.size()); }
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Insert a substring.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __pos1 Iterator referencing location in string to insert at.
|
|
|
|
* @param __str The string to insert.
|
|
|
|
* @param __pos2 Start of characters in str to insert.
|
|
|
|
* @param __n Number of characters to insert.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Reference to this string.
|
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
2009-02-21 01:45:21 +01:00
|
|
|
* @throw std::out_of_range If @a __pos1 > size() or
|
|
|
|
* @a __pos2 > @a __str.size().
|
|
|
|
*
|
|
|
|
* Starting at @a __pos1, insert @a __n character of @a __str
|
|
|
|
* beginning with @a __pos2. If adding characters causes the
|
|
|
|
* length to exceed max_size(), length_error is thrown. If @a
|
|
|
|
* __pos1 is beyond the end of this string or @a __pos2 is
|
|
|
|
* beyond the end of @a __str, out_of_range is thrown. The
|
|
|
|
* value of the string doesn't change if an error is thrown.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
insert(size_type __pos1, const __versa_string& __str,
|
|
|
|
size_type __pos2, size_type __n)
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
{ return this->replace(__pos1, size_type(0), __str._M_data()
|
|
|
|
+ __str._M_check(__pos2, "__versa_string::insert"),
|
|
|
|
__str._M_limit(__pos2, __n)); }
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Insert a C substring.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __pos Iterator referencing location in string to insert at.
|
|
|
|
* @param __s The C string to insert.
|
|
|
|
* @param __n The number of characters to insert.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Reference to this string.
|
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
2009-02-21 01:45:21 +01:00
|
|
|
* @throw std::out_of_range If @a __pos is beyond the end of this
|
2005-07-06 01:07:18 +02:00
|
|
|
* string.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Inserts the first @a __n characters of @a __s starting at @a
|
|
|
|
* __pos. If adding characters causes the length to exceed
|
|
|
|
* max_size(), length_error is thrown. If @a __pos is beyond
|
|
|
|
* end(), out_of_range is thrown. The value of the string
|
|
|
|
* doesn't change if an error is thrown.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
__versa_string&
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
insert(size_type __pos, const _CharT* __s, size_type __n)
|
|
|
|
{ return this->replace(__pos, size_type(0), __s, __n); }
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Insert a C string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __pos Iterator referencing location in string to insert at.
|
|
|
|
* @param __s The C string to insert.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Reference to this string.
|
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
2009-02-21 01:45:21 +01:00
|
|
|
* @throw std::out_of_range If @a __pos is beyond the end of this
|
2005-07-06 01:07:18 +02:00
|
|
|
* string.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Inserts the first @a __n characters of @a __s starting at @a
|
|
|
|
* __pos. If adding characters causes the length to exceed
|
|
|
|
* max_size(), length_error is thrown. If @a __pos is beyond
|
|
|
|
* end(), out_of_range is thrown. The value of the string
|
|
|
|
* doesn't change if an error is thrown.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
insert(size_type __pos, const _CharT* __s)
|
|
|
|
{
|
|
|
|
__glibcxx_requires_string(__s);
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
return this->replace(__pos, size_type(0), __s,
|
|
|
|
traits_type::length(__s));
|
2005-07-06 01:07:18 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Insert multiple characters.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __pos Index in string to insert at.
|
|
|
|
* @param __n Number of characters to insert
|
|
|
|
* @param __c The character to insert.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Reference to this string.
|
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
2009-02-21 01:45:21 +01:00
|
|
|
* @throw std::out_of_range If @a __pos is beyond the end of this
|
2005-07-06 01:07:18 +02:00
|
|
|
* string.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Inserts @a __n copies of character @a __c starting at index
|
|
|
|
* @a __pos. If adding characters causes the length to exceed
|
|
|
|
* max_size(), length_error is thrown. If @a __pos > length(),
|
|
|
|
* out_of_range is thrown. The value of the string doesn't
|
|
|
|
* change if an error is thrown.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
insert(size_type __pos, size_type __n, _CharT __c)
|
|
|
|
{ return _M_replace_aux(_M_check(__pos, "__versa_string::insert"),
|
|
|
|
size_type(0), __n, __c); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Insert one character.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __p Iterator referencing position in string to insert at.
|
|
|
|
* @param __c The character to insert.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Iterator referencing newly inserted char.
|
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Inserts character @a __c at position referenced by @a __p.
|
|
|
|
* If adding character causes the length to exceed max_size(),
|
|
|
|
* length_error is thrown. If @a __p is beyond end of string,
|
|
|
|
* out_of_range is thrown. The value of the string doesn't
|
|
|
|
* change if an error is thrown.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
iterator
|
stl_deque.h (deque<>::insert(iterator, const value_type&), [...]): Adjust C++11 signatures to take a const_iterator.
2013-06-27 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/stl_deque.h (deque<>::insert(iterator,
const value_type&), deque<>::insert(iterator, value_type&&),
deque<>::emplace(iterator, _Args&&...)): Adjust C++11 signatures to
take a const_iterator.
(deque<>::erase): Simplify.
* include/bits/stl_list.h: Likewise.
(_List_iterator<>::_M_const_cast): Add.
* include/bits/stl_vector.h: Likewise.
* include/bits/stl_bvector.h: Likewise.
(_Bit_iterator::_M_const_cast): Add.
* include/bits/deque.tcc: Adjust definitions.
* include/bits/list.tcc: Likewise.
* include/bits/vector.tcc: Likewise.
* include/bits/stl_iterator.h (__normal_iterator<>::_M_const_cast):
Define trivial version in C++98 mode.
* include/ext/vstring.h (__versa_string<>::insert(iterator, _CharT),
__versa_string<>::replace(iterator, iterator, const __versa_string&),
__versa_string<>::replace(iterator, iterator, const _CharT*,
size_type), __versa_string<>::replace(iterator, iterator,
const _CharT*), __versa_string<>::replace(iterator, iterator,
size_type, _CharT)): Adjust C++11 signatures to take a pair of
const_iterators.
* include/debug/deque: Adjust.
* include/debug/list: Likewise.
* include/debug/vector: Likewise.
* include/profile/deque: Likewise.
* include/profile/list: Likewise.
* include/profile/vector: Likewise.
(vector<>::emplace): Add.
* testsuite/util/exception/safety.h: Update.
* testsuite/23_containers/deque/modifiers/emplace/const_iterator.cc:
New.
* testsuite/23_containers/deque/modifiers/insert/const_iterator.cc:
Likewise.
* testsuite/23_containers/list/modifiers/emplace/const_iterator.cc:
Likewise.
* testsuite/23_containers/list/modifiers/insert/const_iterator.cc:
Likewise.
* testsuite/23_containers/vector/bool/modifiers/insert/
const_iterator.cc: Likewise.
* testsuite/23_containers/vector/modifiers/emplace/const_iterator.cc:
Likewise.
* testsuite/23_containers/vector/modifiers/insert/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/insert/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/insert/wchar_t/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/wchar_t/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/char/54577.cc: Move to testsuite/
ext/vstring/modifiers/erase/char/.
* testsuite/ext/vstring/modifiers/wchar_t/54577.cc: Move to testsuite/
ext/vstring/modifiers/wchar_t/.
* testsuite/ext/vstring/modifiers/char/pop_back.cc: Move to testsuite/
ext/vstring/modifiers/pop_back/char/.
* testsuite/ext/vstring/modifiers/wchar_t/pop_back.cc: Move to
testsuite/ext/vstring/modifiers/pop_back/wchar_t/.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc:
Adjust dg-error line number.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc:
Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc:
Likewise.
From-SVN: r200458
2013-06-27 11:51:21 +02:00
|
|
|
#if __cplusplus >= 201103L
|
|
|
|
insert(const_iterator __p, _CharT __c)
|
|
|
|
#else
|
|
|
|
insert(iterator __p, _CharT __c)
|
|
|
|
#endif
|
2005-07-06 01:07:18 +02:00
|
|
|
{
|
|
|
|
_GLIBCXX_DEBUG_PEDASSERT(__p >= _M_ibegin() && __p <= _M_iend());
|
|
|
|
const size_type __pos = __p - _M_ibegin();
|
|
|
|
_M_replace_aux(__pos, size_type(0), size_type(1), __c);
|
|
|
|
this->_M_set_leaked();
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
return iterator(this->_M_data() + __pos);
|
2005-07-06 01:07:18 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Remove characters.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __pos Index of first character to remove (default 0).
|
|
|
|
* @param __n Number of characters to remove (default remainder).
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Reference to this string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @throw std::out_of_range If @a __pos is beyond the end of this
|
2005-07-06 01:07:18 +02:00
|
|
|
* string.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Removes @a __n characters from this string starting at @a
|
|
|
|
* __pos. The length of the string is reduced by @a __n. If
|
|
|
|
* there are < @a __n characters to remove, the remainder of
|
|
|
|
* the string is truncated. If @a __p is beyond end of string,
|
|
|
|
* out_of_range is thrown. The value of the string doesn't
|
|
|
|
* change if an error is thrown.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
erase(size_type __pos = 0, size_type __n = npos)
|
|
|
|
{
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
this->_M_erase(_M_check(__pos, "__versa_string::erase"),
|
|
|
|
_M_limit(__pos, __n));
|
2005-07-06 01:07:18 +02:00
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Remove one character.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __position Iterator referencing the character to remove.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return iterator referencing same location after removal.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Removes the character at @a __position from this string. The
|
|
|
|
* value of the string doesn't change if an error is thrown.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
iterator
|
2013-05-10 17:18:33 +02:00
|
|
|
#if __cplusplus >= 201103L
|
|
|
|
erase(const_iterator __position)
|
|
|
|
#else
|
|
|
|
erase(iterator __position)
|
|
|
|
#endif
|
2005-07-06 01:07:18 +02:00
|
|
|
{
|
|
|
|
_GLIBCXX_DEBUG_PEDASSERT(__position >= _M_ibegin()
|
|
|
|
&& __position < _M_iend());
|
|
|
|
const size_type __pos = __position - _M_ibegin();
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
this->_M_erase(__pos, size_type(1));
|
2005-07-06 01:07:18 +02:00
|
|
|
this->_M_set_leaked();
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
return iterator(this->_M_data() + __pos);
|
2005-07-06 01:07:18 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Remove a range of characters.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __first Iterator referencing the first character to remove.
|
|
|
|
* @param __last Iterator referencing the end of the range.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Iterator referencing location of first after removal.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Removes the characters in the range [first,last) from this
|
|
|
|
* string. The value of the string doesn't change if an error
|
|
|
|
* is thrown.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
iterator
|
2013-05-10 17:18:33 +02:00
|
|
|
#if __cplusplus >= 201103L
|
|
|
|
erase(const_iterator __first, const_iterator __last)
|
|
|
|
#else
|
2005-07-06 01:07:18 +02:00
|
|
|
erase(iterator __first, iterator __last)
|
2013-05-10 17:18:33 +02:00
|
|
|
#endif
|
2005-07-06 01:07:18 +02:00
|
|
|
{
|
|
|
|
_GLIBCXX_DEBUG_PEDASSERT(__first >= _M_ibegin() && __first <= __last
|
|
|
|
&& __last <= _M_iend());
|
|
|
|
const size_type __pos = __first - _M_ibegin();
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
this->_M_erase(__pos, __last - __first);
|
2005-07-06 01:07:18 +02:00
|
|
|
this->_M_set_leaked();
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
return iterator(this->_M_data() + __pos);
|
2005-07-06 01:07:18 +02:00
|
|
|
}
|
|
|
|
|
2012-11-10 18:27:22 +01:00
|
|
|
#if __cplusplus >= 201103L
|
2011-11-07 01:06:23 +01:00
|
|
|
/**
|
|
|
|
* @brief Remove the last character.
|
|
|
|
*
|
|
|
|
* The string must be non-empty.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
pop_back()
|
|
|
|
{ this->_M_erase(size()-1, 1); }
|
2012-11-10 18:27:22 +01:00
|
|
|
#endif // C++11
|
2011-11-07 01:06:23 +01:00
|
|
|
|
2005-07-06 01:07:18 +02:00
|
|
|
/**
|
|
|
|
* @brief Replace characters with value from another string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __pos Index of first character to replace.
|
|
|
|
* @param __n Number of characters to be replaced.
|
|
|
|
* @param __str String to insert.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Reference to this string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @throw std::out_of_range If @a __pos is beyond the end of this
|
2005-07-06 01:07:18 +02:00
|
|
|
* string.
|
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Removes the characters in the range [pos,pos+n) from this
|
|
|
|
* string. In place, the value of @a __str is inserted. If @a
|
|
|
|
* __pos is beyond end of string, out_of_range is thrown. If
|
|
|
|
* the length of the result exceeds max_size(), length_error is
|
|
|
|
* thrown. The value of the string doesn't change if an error
|
|
|
|
* is thrown.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
replace(size_type __pos, size_type __n, const __versa_string& __str)
|
|
|
|
{ return this->replace(__pos, __n, __str._M_data(), __str.size()); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Replace characters with value from another string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __pos1 Index of first character to replace.
|
|
|
|
* @param __n1 Number of characters to be replaced.
|
|
|
|
* @param __str String to insert.
|
|
|
|
* @param __pos2 Index of first character of str to use.
|
|
|
|
* @param __n2 Number of characters from str to use.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Reference to this string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @throw std::out_of_range If @a __pos1 > size() or @a __pos2 >
|
2005-07-06 01:07:18 +02:00
|
|
|
* str.size().
|
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Removes the characters in the range [pos1,pos1 + n) from
|
|
|
|
* this string. In place, the value of @a __str is inserted.
|
|
|
|
* If @a __pos is beyond end of string, out_of_range is thrown.
|
|
|
|
* If the length of the result exceeds max_size(), length_error
|
|
|
|
* is thrown. The value of the string doesn't change if an
|
|
|
|
* error is thrown.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
replace(size_type __pos1, size_type __n1, const __versa_string& __str,
|
|
|
|
size_type __pos2, size_type __n2)
|
|
|
|
{
|
|
|
|
return this->replace(__pos1, __n1, __str._M_data()
|
|
|
|
+ __str._M_check(__pos2,
|
|
|
|
"__versa_string::replace"),
|
|
|
|
__str._M_limit(__pos2, __n2));
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Replace characters with value of a C substring.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __pos Index of first character to replace.
|
|
|
|
* @param __n1 Number of characters to be replaced.
|
|
|
|
* @param __s C string to insert.
|
|
|
|
* @param __n2 Number of characters from @a __s to use.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Reference to this string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @throw std::out_of_range If @a __pos1 > size().
|
2005-07-06 01:07:18 +02:00
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Removes the characters in the range [pos,pos + n1) from this
|
|
|
|
* string. In place, the first @a __n2 characters of @a __s
|
|
|
|
* are inserted, or all of @a __s if @a __n2 is too large. If
|
|
|
|
* @a __pos is beyond end of string, out_of_range is thrown.
|
|
|
|
* If the length of result exceeds max_size(), length_error is
|
|
|
|
* thrown. The value of the string doesn't change if an error
|
|
|
|
* is thrown.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
replace(size_type __pos, size_type __n1, const _CharT* __s,
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
size_type __n2)
|
|
|
|
{
|
|
|
|
__glibcxx_requires_string_len(__s, __n2);
|
|
|
|
return _M_replace(_M_check(__pos, "__versa_string::replace"),
|
|
|
|
_M_limit(__pos, __n1), __s, __n2);
|
|
|
|
}
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Replace characters with value of a C string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __pos Index of first character to replace.
|
|
|
|
* @param __n1 Number of characters to be replaced.
|
|
|
|
* @param __s C string to insert.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Reference to this string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @throw std::out_of_range If @a __pos > size().
|
2005-07-06 01:07:18 +02:00
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Removes the characters in the range [pos,pos + n1) from this
|
2010-04-03 22:45:49 +02:00
|
|
|
* string. In place, the characters of @a __s are inserted. If
|
|
|
|
* @a pos is beyond end of string, out_of_range is thrown. If
|
|
|
|
* the length of result exceeds max_size(), length_error is thrown.
|
|
|
|
* The value of the string doesn't change if an error is thrown.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
replace(size_type __pos, size_type __n1, const _CharT* __s)
|
|
|
|
{
|
|
|
|
__glibcxx_requires_string(__s);
|
|
|
|
return this->replace(__pos, __n1, __s, traits_type::length(__s));
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Replace characters with multiple characters.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __pos Index of first character to replace.
|
|
|
|
* @param __n1 Number of characters to be replaced.
|
|
|
|
* @param __n2 Number of characters to insert.
|
|
|
|
* @param __c Character to insert.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Reference to this string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @throw std::out_of_range If @a __pos > size().
|
2005-07-06 01:07:18 +02:00
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Removes the characters in the range [pos,pos + n1) from this
|
|
|
|
* string. In place, @a __n2 copies of @a __c are inserted.
|
|
|
|
* If @a __pos is beyond end of string, out_of_range is thrown.
|
|
|
|
* If the length of result exceeds max_size(), length_error is
|
|
|
|
* thrown. The value of the string doesn't change if an error
|
|
|
|
* is thrown.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
replace(size_type __pos, size_type __n1, size_type __n2, _CharT __c)
|
|
|
|
{ return _M_replace_aux(_M_check(__pos, "__versa_string::replace"),
|
|
|
|
_M_limit(__pos, __n1), __n2, __c); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Replace range of characters with string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __i1 Iterator referencing start of range to replace.
|
|
|
|
* @param __i2 Iterator referencing end of range to replace.
|
|
|
|
* @param __str String value to insert.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Reference to this string.
|
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Removes the characters in the range [i1,i2). In place, the
|
|
|
|
* value of @a __str is inserted. If the length of result
|
|
|
|
* exceeds max_size(), length_error is thrown. The value of
|
|
|
|
* the string doesn't change if an error is thrown.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
__versa_string&
|
stl_deque.h (deque<>::insert(iterator, const value_type&), [...]): Adjust C++11 signatures to take a const_iterator.
2013-06-27 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/stl_deque.h (deque<>::insert(iterator,
const value_type&), deque<>::insert(iterator, value_type&&),
deque<>::emplace(iterator, _Args&&...)): Adjust C++11 signatures to
take a const_iterator.
(deque<>::erase): Simplify.
* include/bits/stl_list.h: Likewise.
(_List_iterator<>::_M_const_cast): Add.
* include/bits/stl_vector.h: Likewise.
* include/bits/stl_bvector.h: Likewise.
(_Bit_iterator::_M_const_cast): Add.
* include/bits/deque.tcc: Adjust definitions.
* include/bits/list.tcc: Likewise.
* include/bits/vector.tcc: Likewise.
* include/bits/stl_iterator.h (__normal_iterator<>::_M_const_cast):
Define trivial version in C++98 mode.
* include/ext/vstring.h (__versa_string<>::insert(iterator, _CharT),
__versa_string<>::replace(iterator, iterator, const __versa_string&),
__versa_string<>::replace(iterator, iterator, const _CharT*,
size_type), __versa_string<>::replace(iterator, iterator,
const _CharT*), __versa_string<>::replace(iterator, iterator,
size_type, _CharT)): Adjust C++11 signatures to take a pair of
const_iterators.
* include/debug/deque: Adjust.
* include/debug/list: Likewise.
* include/debug/vector: Likewise.
* include/profile/deque: Likewise.
* include/profile/list: Likewise.
* include/profile/vector: Likewise.
(vector<>::emplace): Add.
* testsuite/util/exception/safety.h: Update.
* testsuite/23_containers/deque/modifiers/emplace/const_iterator.cc:
New.
* testsuite/23_containers/deque/modifiers/insert/const_iterator.cc:
Likewise.
* testsuite/23_containers/list/modifiers/emplace/const_iterator.cc:
Likewise.
* testsuite/23_containers/list/modifiers/insert/const_iterator.cc:
Likewise.
* testsuite/23_containers/vector/bool/modifiers/insert/
const_iterator.cc: Likewise.
* testsuite/23_containers/vector/modifiers/emplace/const_iterator.cc:
Likewise.
* testsuite/23_containers/vector/modifiers/insert/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/insert/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/insert/wchar_t/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/wchar_t/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/char/54577.cc: Move to testsuite/
ext/vstring/modifiers/erase/char/.
* testsuite/ext/vstring/modifiers/wchar_t/54577.cc: Move to testsuite/
ext/vstring/modifiers/wchar_t/.
* testsuite/ext/vstring/modifiers/char/pop_back.cc: Move to testsuite/
ext/vstring/modifiers/pop_back/char/.
* testsuite/ext/vstring/modifiers/wchar_t/pop_back.cc: Move to
testsuite/ext/vstring/modifiers/pop_back/wchar_t/.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc:
Adjust dg-error line number.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc:
Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc:
Likewise.
From-SVN: r200458
2013-06-27 11:51:21 +02:00
|
|
|
#if __cplusplus >= 201103L
|
|
|
|
replace(const_iterator __i1, const_iterator __i2,
|
|
|
|
const __versa_string& __str)
|
|
|
|
#else
|
2005-07-06 01:07:18 +02:00
|
|
|
replace(iterator __i1, iterator __i2, const __versa_string& __str)
|
stl_deque.h (deque<>::insert(iterator, const value_type&), [...]): Adjust C++11 signatures to take a const_iterator.
2013-06-27 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/stl_deque.h (deque<>::insert(iterator,
const value_type&), deque<>::insert(iterator, value_type&&),
deque<>::emplace(iterator, _Args&&...)): Adjust C++11 signatures to
take a const_iterator.
(deque<>::erase): Simplify.
* include/bits/stl_list.h: Likewise.
(_List_iterator<>::_M_const_cast): Add.
* include/bits/stl_vector.h: Likewise.
* include/bits/stl_bvector.h: Likewise.
(_Bit_iterator::_M_const_cast): Add.
* include/bits/deque.tcc: Adjust definitions.
* include/bits/list.tcc: Likewise.
* include/bits/vector.tcc: Likewise.
* include/bits/stl_iterator.h (__normal_iterator<>::_M_const_cast):
Define trivial version in C++98 mode.
* include/ext/vstring.h (__versa_string<>::insert(iterator, _CharT),
__versa_string<>::replace(iterator, iterator, const __versa_string&),
__versa_string<>::replace(iterator, iterator, const _CharT*,
size_type), __versa_string<>::replace(iterator, iterator,
const _CharT*), __versa_string<>::replace(iterator, iterator,
size_type, _CharT)): Adjust C++11 signatures to take a pair of
const_iterators.
* include/debug/deque: Adjust.
* include/debug/list: Likewise.
* include/debug/vector: Likewise.
* include/profile/deque: Likewise.
* include/profile/list: Likewise.
* include/profile/vector: Likewise.
(vector<>::emplace): Add.
* testsuite/util/exception/safety.h: Update.
* testsuite/23_containers/deque/modifiers/emplace/const_iterator.cc:
New.
* testsuite/23_containers/deque/modifiers/insert/const_iterator.cc:
Likewise.
* testsuite/23_containers/list/modifiers/emplace/const_iterator.cc:
Likewise.
* testsuite/23_containers/list/modifiers/insert/const_iterator.cc:
Likewise.
* testsuite/23_containers/vector/bool/modifiers/insert/
const_iterator.cc: Likewise.
* testsuite/23_containers/vector/modifiers/emplace/const_iterator.cc:
Likewise.
* testsuite/23_containers/vector/modifiers/insert/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/insert/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/insert/wchar_t/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/wchar_t/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/char/54577.cc: Move to testsuite/
ext/vstring/modifiers/erase/char/.
* testsuite/ext/vstring/modifiers/wchar_t/54577.cc: Move to testsuite/
ext/vstring/modifiers/wchar_t/.
* testsuite/ext/vstring/modifiers/char/pop_back.cc: Move to testsuite/
ext/vstring/modifiers/pop_back/char/.
* testsuite/ext/vstring/modifiers/wchar_t/pop_back.cc: Move to
testsuite/ext/vstring/modifiers/pop_back/wchar_t/.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc:
Adjust dg-error line number.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc:
Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc:
Likewise.
From-SVN: r200458
2013-06-27 11:51:21 +02:00
|
|
|
#endif
|
2005-07-06 01:07:18 +02:00
|
|
|
{ return this->replace(__i1, __i2, __str._M_data(), __str.size()); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Replace range of characters with C substring.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __i1 Iterator referencing start of range to replace.
|
|
|
|
* @param __i2 Iterator referencing end of range to replace.
|
|
|
|
* @param __s C string value to insert.
|
|
|
|
* @param __n Number of characters from s to insert.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Reference to this string.
|
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Removes the characters in the range [i1,i2). In place, the
|
|
|
|
* first @a n characters of @a __s are inserted. If the length
|
|
|
|
* of result exceeds max_size(), length_error is thrown. The
|
|
|
|
* value of the string doesn't change if an error is thrown.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
__versa_string&
|
stl_deque.h (deque<>::insert(iterator, const value_type&), [...]): Adjust C++11 signatures to take a const_iterator.
2013-06-27 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/stl_deque.h (deque<>::insert(iterator,
const value_type&), deque<>::insert(iterator, value_type&&),
deque<>::emplace(iterator, _Args&&...)): Adjust C++11 signatures to
take a const_iterator.
(deque<>::erase): Simplify.
* include/bits/stl_list.h: Likewise.
(_List_iterator<>::_M_const_cast): Add.
* include/bits/stl_vector.h: Likewise.
* include/bits/stl_bvector.h: Likewise.
(_Bit_iterator::_M_const_cast): Add.
* include/bits/deque.tcc: Adjust definitions.
* include/bits/list.tcc: Likewise.
* include/bits/vector.tcc: Likewise.
* include/bits/stl_iterator.h (__normal_iterator<>::_M_const_cast):
Define trivial version in C++98 mode.
* include/ext/vstring.h (__versa_string<>::insert(iterator, _CharT),
__versa_string<>::replace(iterator, iterator, const __versa_string&),
__versa_string<>::replace(iterator, iterator, const _CharT*,
size_type), __versa_string<>::replace(iterator, iterator,
const _CharT*), __versa_string<>::replace(iterator, iterator,
size_type, _CharT)): Adjust C++11 signatures to take a pair of
const_iterators.
* include/debug/deque: Adjust.
* include/debug/list: Likewise.
* include/debug/vector: Likewise.
* include/profile/deque: Likewise.
* include/profile/list: Likewise.
* include/profile/vector: Likewise.
(vector<>::emplace): Add.
* testsuite/util/exception/safety.h: Update.
* testsuite/23_containers/deque/modifiers/emplace/const_iterator.cc:
New.
* testsuite/23_containers/deque/modifiers/insert/const_iterator.cc:
Likewise.
* testsuite/23_containers/list/modifiers/emplace/const_iterator.cc:
Likewise.
* testsuite/23_containers/list/modifiers/insert/const_iterator.cc:
Likewise.
* testsuite/23_containers/vector/bool/modifiers/insert/
const_iterator.cc: Likewise.
* testsuite/23_containers/vector/modifiers/emplace/const_iterator.cc:
Likewise.
* testsuite/23_containers/vector/modifiers/insert/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/insert/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/insert/wchar_t/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/wchar_t/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/char/54577.cc: Move to testsuite/
ext/vstring/modifiers/erase/char/.
* testsuite/ext/vstring/modifiers/wchar_t/54577.cc: Move to testsuite/
ext/vstring/modifiers/wchar_t/.
* testsuite/ext/vstring/modifiers/char/pop_back.cc: Move to testsuite/
ext/vstring/modifiers/pop_back/char/.
* testsuite/ext/vstring/modifiers/wchar_t/pop_back.cc: Move to
testsuite/ext/vstring/modifiers/pop_back/wchar_t/.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc:
Adjust dg-error line number.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc:
Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc:
Likewise.
From-SVN: r200458
2013-06-27 11:51:21 +02:00
|
|
|
#if __cplusplus >= 201103L
|
|
|
|
replace(const_iterator __i1, const_iterator __i2,
|
|
|
|
const _CharT* __s, size_type __n)
|
|
|
|
#else
|
2005-07-06 01:07:18 +02:00
|
|
|
replace(iterator __i1, iterator __i2, const _CharT* __s, size_type __n)
|
stl_deque.h (deque<>::insert(iterator, const value_type&), [...]): Adjust C++11 signatures to take a const_iterator.
2013-06-27 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/stl_deque.h (deque<>::insert(iterator,
const value_type&), deque<>::insert(iterator, value_type&&),
deque<>::emplace(iterator, _Args&&...)): Adjust C++11 signatures to
take a const_iterator.
(deque<>::erase): Simplify.
* include/bits/stl_list.h: Likewise.
(_List_iterator<>::_M_const_cast): Add.
* include/bits/stl_vector.h: Likewise.
* include/bits/stl_bvector.h: Likewise.
(_Bit_iterator::_M_const_cast): Add.
* include/bits/deque.tcc: Adjust definitions.
* include/bits/list.tcc: Likewise.
* include/bits/vector.tcc: Likewise.
* include/bits/stl_iterator.h (__normal_iterator<>::_M_const_cast):
Define trivial version in C++98 mode.
* include/ext/vstring.h (__versa_string<>::insert(iterator, _CharT),
__versa_string<>::replace(iterator, iterator, const __versa_string&),
__versa_string<>::replace(iterator, iterator, const _CharT*,
size_type), __versa_string<>::replace(iterator, iterator,
const _CharT*), __versa_string<>::replace(iterator, iterator,
size_type, _CharT)): Adjust C++11 signatures to take a pair of
const_iterators.
* include/debug/deque: Adjust.
* include/debug/list: Likewise.
* include/debug/vector: Likewise.
* include/profile/deque: Likewise.
* include/profile/list: Likewise.
* include/profile/vector: Likewise.
(vector<>::emplace): Add.
* testsuite/util/exception/safety.h: Update.
* testsuite/23_containers/deque/modifiers/emplace/const_iterator.cc:
New.
* testsuite/23_containers/deque/modifiers/insert/const_iterator.cc:
Likewise.
* testsuite/23_containers/list/modifiers/emplace/const_iterator.cc:
Likewise.
* testsuite/23_containers/list/modifiers/insert/const_iterator.cc:
Likewise.
* testsuite/23_containers/vector/bool/modifiers/insert/
const_iterator.cc: Likewise.
* testsuite/23_containers/vector/modifiers/emplace/const_iterator.cc:
Likewise.
* testsuite/23_containers/vector/modifiers/insert/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/insert/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/insert/wchar_t/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/wchar_t/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/char/54577.cc: Move to testsuite/
ext/vstring/modifiers/erase/char/.
* testsuite/ext/vstring/modifiers/wchar_t/54577.cc: Move to testsuite/
ext/vstring/modifiers/wchar_t/.
* testsuite/ext/vstring/modifiers/char/pop_back.cc: Move to testsuite/
ext/vstring/modifiers/pop_back/char/.
* testsuite/ext/vstring/modifiers/wchar_t/pop_back.cc: Move to
testsuite/ext/vstring/modifiers/pop_back/wchar_t/.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc:
Adjust dg-error line number.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc:
Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc:
Likewise.
From-SVN: r200458
2013-06-27 11:51:21 +02:00
|
|
|
#endif
|
2005-07-06 01:07:18 +02:00
|
|
|
{
|
|
|
|
_GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
|
|
|
|
&& __i2 <= _M_iend());
|
|
|
|
return this->replace(__i1 - _M_ibegin(), __i2 - __i1, __s, __n);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Replace range of characters with C string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __i1 Iterator referencing start of range to replace.
|
|
|
|
* @param __i2 Iterator referencing end of range to replace.
|
|
|
|
* @param __s C string value to insert.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Reference to this string.
|
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
|
|
|
*
|
|
|
|
* Removes the characters in the range [i1,i2). In place, the
|
2009-02-21 01:45:21 +01:00
|
|
|
* characters of @a __s are inserted. If the length of result
|
|
|
|
* exceeds max_size(), length_error is thrown. The value of
|
|
|
|
* the string doesn't change if an error is thrown.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
__versa_string&
|
stl_deque.h (deque<>::insert(iterator, const value_type&), [...]): Adjust C++11 signatures to take a const_iterator.
2013-06-27 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/stl_deque.h (deque<>::insert(iterator,
const value_type&), deque<>::insert(iterator, value_type&&),
deque<>::emplace(iterator, _Args&&...)): Adjust C++11 signatures to
take a const_iterator.
(deque<>::erase): Simplify.
* include/bits/stl_list.h: Likewise.
(_List_iterator<>::_M_const_cast): Add.
* include/bits/stl_vector.h: Likewise.
* include/bits/stl_bvector.h: Likewise.
(_Bit_iterator::_M_const_cast): Add.
* include/bits/deque.tcc: Adjust definitions.
* include/bits/list.tcc: Likewise.
* include/bits/vector.tcc: Likewise.
* include/bits/stl_iterator.h (__normal_iterator<>::_M_const_cast):
Define trivial version in C++98 mode.
* include/ext/vstring.h (__versa_string<>::insert(iterator, _CharT),
__versa_string<>::replace(iterator, iterator, const __versa_string&),
__versa_string<>::replace(iterator, iterator, const _CharT*,
size_type), __versa_string<>::replace(iterator, iterator,
const _CharT*), __versa_string<>::replace(iterator, iterator,
size_type, _CharT)): Adjust C++11 signatures to take a pair of
const_iterators.
* include/debug/deque: Adjust.
* include/debug/list: Likewise.
* include/debug/vector: Likewise.
* include/profile/deque: Likewise.
* include/profile/list: Likewise.
* include/profile/vector: Likewise.
(vector<>::emplace): Add.
* testsuite/util/exception/safety.h: Update.
* testsuite/23_containers/deque/modifiers/emplace/const_iterator.cc:
New.
* testsuite/23_containers/deque/modifiers/insert/const_iterator.cc:
Likewise.
* testsuite/23_containers/list/modifiers/emplace/const_iterator.cc:
Likewise.
* testsuite/23_containers/list/modifiers/insert/const_iterator.cc:
Likewise.
* testsuite/23_containers/vector/bool/modifiers/insert/
const_iterator.cc: Likewise.
* testsuite/23_containers/vector/modifiers/emplace/const_iterator.cc:
Likewise.
* testsuite/23_containers/vector/modifiers/insert/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/insert/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/insert/wchar_t/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/wchar_t/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/char/54577.cc: Move to testsuite/
ext/vstring/modifiers/erase/char/.
* testsuite/ext/vstring/modifiers/wchar_t/54577.cc: Move to testsuite/
ext/vstring/modifiers/wchar_t/.
* testsuite/ext/vstring/modifiers/char/pop_back.cc: Move to testsuite/
ext/vstring/modifiers/pop_back/char/.
* testsuite/ext/vstring/modifiers/wchar_t/pop_back.cc: Move to
testsuite/ext/vstring/modifiers/pop_back/wchar_t/.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc:
Adjust dg-error line number.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc:
Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc:
Likewise.
From-SVN: r200458
2013-06-27 11:51:21 +02:00
|
|
|
#if __cplusplus >= 201103L
|
|
|
|
replace(const_iterator __i1, const_iterator __i2, const _CharT* __s)
|
|
|
|
#else
|
|
|
|
replace(iterator __i1, iterator __i2, const _CharT* __s)
|
|
|
|
#endif
|
2005-07-06 01:07:18 +02:00
|
|
|
{
|
|
|
|
__glibcxx_requires_string(__s);
|
|
|
|
return this->replace(__i1, __i2, __s, traits_type::length(__s));
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Replace range of characters with multiple characters
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __i1 Iterator referencing start of range to replace.
|
|
|
|
* @param __i2 Iterator referencing end of range to replace.
|
|
|
|
* @param __n Number of characters to insert.
|
|
|
|
* @param __c Character to insert.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Reference to this string.
|
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Removes the characters in the range [i1,i2). In place, @a
|
|
|
|
* __n copies of @a __c are inserted. If the length of result
|
|
|
|
* exceeds max_size(), length_error is thrown. The value of
|
|
|
|
* the string doesn't change if an error is thrown.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
__versa_string&
|
stl_deque.h (deque<>::insert(iterator, const value_type&), [...]): Adjust C++11 signatures to take a const_iterator.
2013-06-27 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/stl_deque.h (deque<>::insert(iterator,
const value_type&), deque<>::insert(iterator, value_type&&),
deque<>::emplace(iterator, _Args&&...)): Adjust C++11 signatures to
take a const_iterator.
(deque<>::erase): Simplify.
* include/bits/stl_list.h: Likewise.
(_List_iterator<>::_M_const_cast): Add.
* include/bits/stl_vector.h: Likewise.
* include/bits/stl_bvector.h: Likewise.
(_Bit_iterator::_M_const_cast): Add.
* include/bits/deque.tcc: Adjust definitions.
* include/bits/list.tcc: Likewise.
* include/bits/vector.tcc: Likewise.
* include/bits/stl_iterator.h (__normal_iterator<>::_M_const_cast):
Define trivial version in C++98 mode.
* include/ext/vstring.h (__versa_string<>::insert(iterator, _CharT),
__versa_string<>::replace(iterator, iterator, const __versa_string&),
__versa_string<>::replace(iterator, iterator, const _CharT*,
size_type), __versa_string<>::replace(iterator, iterator,
const _CharT*), __versa_string<>::replace(iterator, iterator,
size_type, _CharT)): Adjust C++11 signatures to take a pair of
const_iterators.
* include/debug/deque: Adjust.
* include/debug/list: Likewise.
* include/debug/vector: Likewise.
* include/profile/deque: Likewise.
* include/profile/list: Likewise.
* include/profile/vector: Likewise.
(vector<>::emplace): Add.
* testsuite/util/exception/safety.h: Update.
* testsuite/23_containers/deque/modifiers/emplace/const_iterator.cc:
New.
* testsuite/23_containers/deque/modifiers/insert/const_iterator.cc:
Likewise.
* testsuite/23_containers/list/modifiers/emplace/const_iterator.cc:
Likewise.
* testsuite/23_containers/list/modifiers/insert/const_iterator.cc:
Likewise.
* testsuite/23_containers/vector/bool/modifiers/insert/
const_iterator.cc: Likewise.
* testsuite/23_containers/vector/modifiers/emplace/const_iterator.cc:
Likewise.
* testsuite/23_containers/vector/modifiers/insert/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/insert/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/insert/wchar_t/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/wchar_t/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/char/54577.cc: Move to testsuite/
ext/vstring/modifiers/erase/char/.
* testsuite/ext/vstring/modifiers/wchar_t/54577.cc: Move to testsuite/
ext/vstring/modifiers/wchar_t/.
* testsuite/ext/vstring/modifiers/char/pop_back.cc: Move to testsuite/
ext/vstring/modifiers/pop_back/char/.
* testsuite/ext/vstring/modifiers/wchar_t/pop_back.cc: Move to
testsuite/ext/vstring/modifiers/pop_back/wchar_t/.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc:
Adjust dg-error line number.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc:
Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc:
Likewise.
From-SVN: r200458
2013-06-27 11:51:21 +02:00
|
|
|
#if __cplusplus >= 201103L
|
|
|
|
replace(const_iterator __i1, const_iterator __i2, size_type __n,
|
|
|
|
_CharT __c)
|
|
|
|
#else
|
2005-07-06 01:07:18 +02:00
|
|
|
replace(iterator __i1, iterator __i2, size_type __n, _CharT __c)
|
stl_deque.h (deque<>::insert(iterator, const value_type&), [...]): Adjust C++11 signatures to take a const_iterator.
2013-06-27 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/stl_deque.h (deque<>::insert(iterator,
const value_type&), deque<>::insert(iterator, value_type&&),
deque<>::emplace(iterator, _Args&&...)): Adjust C++11 signatures to
take a const_iterator.
(deque<>::erase): Simplify.
* include/bits/stl_list.h: Likewise.
(_List_iterator<>::_M_const_cast): Add.
* include/bits/stl_vector.h: Likewise.
* include/bits/stl_bvector.h: Likewise.
(_Bit_iterator::_M_const_cast): Add.
* include/bits/deque.tcc: Adjust definitions.
* include/bits/list.tcc: Likewise.
* include/bits/vector.tcc: Likewise.
* include/bits/stl_iterator.h (__normal_iterator<>::_M_const_cast):
Define trivial version in C++98 mode.
* include/ext/vstring.h (__versa_string<>::insert(iterator, _CharT),
__versa_string<>::replace(iterator, iterator, const __versa_string&),
__versa_string<>::replace(iterator, iterator, const _CharT*,
size_type), __versa_string<>::replace(iterator, iterator,
const _CharT*), __versa_string<>::replace(iterator, iterator,
size_type, _CharT)): Adjust C++11 signatures to take a pair of
const_iterators.
* include/debug/deque: Adjust.
* include/debug/list: Likewise.
* include/debug/vector: Likewise.
* include/profile/deque: Likewise.
* include/profile/list: Likewise.
* include/profile/vector: Likewise.
(vector<>::emplace): Add.
* testsuite/util/exception/safety.h: Update.
* testsuite/23_containers/deque/modifiers/emplace/const_iterator.cc:
New.
* testsuite/23_containers/deque/modifiers/insert/const_iterator.cc:
Likewise.
* testsuite/23_containers/list/modifiers/emplace/const_iterator.cc:
Likewise.
* testsuite/23_containers/list/modifiers/insert/const_iterator.cc:
Likewise.
* testsuite/23_containers/vector/bool/modifiers/insert/
const_iterator.cc: Likewise.
* testsuite/23_containers/vector/modifiers/emplace/const_iterator.cc:
Likewise.
* testsuite/23_containers/vector/modifiers/insert/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/insert/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/insert/wchar_t/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/wchar_t/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/char/54577.cc: Move to testsuite/
ext/vstring/modifiers/erase/char/.
* testsuite/ext/vstring/modifiers/wchar_t/54577.cc: Move to testsuite/
ext/vstring/modifiers/wchar_t/.
* testsuite/ext/vstring/modifiers/char/pop_back.cc: Move to testsuite/
ext/vstring/modifiers/pop_back/char/.
* testsuite/ext/vstring/modifiers/wchar_t/pop_back.cc: Move to
testsuite/ext/vstring/modifiers/pop_back/wchar_t/.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc:
Adjust dg-error line number.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc:
Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc:
Likewise.
From-SVN: r200458
2013-06-27 11:51:21 +02:00
|
|
|
#endif
|
2005-07-06 01:07:18 +02:00
|
|
|
{
|
|
|
|
_GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
|
|
|
|
&& __i2 <= _M_iend());
|
|
|
|
return _M_replace_aux(__i1 - _M_ibegin(), __i2 - __i1, __n, __c);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Replace range of characters with range.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __i1 Iterator referencing start of range to replace.
|
|
|
|
* @param __i2 Iterator referencing end of range to replace.
|
|
|
|
* @param __k1 Iterator referencing start of range to insert.
|
|
|
|
* @param __k2 Iterator referencing end of range to insert.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Reference to this string.
|
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Removes the characters in the range [i1,i2). In place,
|
|
|
|
* characters in the range [k1,k2) are inserted. If the length
|
|
|
|
* of result exceeds max_size(), length_error is thrown. The
|
|
|
|
* value of the string doesn't change if an error is thrown.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
2012-11-10 18:27:22 +01:00
|
|
|
#if __cplusplus >= 201103L
|
re PR libstdc++/43813 ([DR1234] vector<T*>(3, NULL) fails to compile)
2012-03-04 Paolo Carlini <paolo.carlini@oracle.com>
Jonathan Wakely <jwakely.gcc@gmail.com>
PR libstdc++/43813
* include/bits/stl_iterator_base_types.h (_RequireInputIter): New.
* include/ext/vstring.h (__versa_string<>::__versa_string
(_InputIterator, _InputIterator, const _Alloc&),
__versa_string<>::append(_InputIterator, _InputIterator),
__versa_string<>::assign(_InputIterator, _InputIterator),
__versa_string<>::insert(iterator, _InputIterator,
_InputIterator), __versa_string<>::replace(iterator, iterator,
_InputIterator, _InputIterator)): Use it.
* include/bits/stl_list.h (list<>::list(_InputIterator,
_InputIterator, const allocator_type&), list<>::assign(_InputIterator,
_InputIterator), list<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/stl_vector.h (vector<>::vector(_InputIterator,
_InputIterator, const allocator_type&), vector<>::assign(_InputIterator,
_InputIterator), vectort<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/stl_deque.h (deque<>::deque(_InputIterator,
_InputIterator, const allocator_type&), deque<>::deque(_InputIterator,
_InputIterator), deque<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/stl_bvector.h (vector<>::vector(_InputIterator,
_InputIterator, const allocator_type&), vector<>::deque(_InputIterator,
_InputIterator), vector<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/forward_list.h (forward_list<>::forward_list
(_InputIterator, _InputIterator, const allocator_type&),
forward_list<>::assign(_InputIterator, _InputIterator),
forward_list<>::insert_after(const_iterator, _InputIterator,
_InputIterator)): Likewise.
(forward_list<>::_M_initialize_dispatch(,, __true_type): Remove.
(forward_list<>::_M_range_initialize): Add, adjust everywhere.
* include/bits/forward_list.tcc: Adjust.
* include/debug/forward_list: Adjust.
* include/debug/vector: Likewise.
* include/debug/deque: Likewise.
* include/debug/list: Likewise.
* testsuite/ext/vstring/requirements/do_the_right_thing.cc: New.
* testsuite/23_containers/forward_list/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/vector/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/deque/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/list/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
assign_neg.cc: Adjust dg-error line number.
* testsuite/23_containers/forward_list/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
assign_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
assign_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
assign_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
Co-Authored-By: Jonathan Wakely <jwakely.gcc@gmail.com>
From-SVN: r184911
2012-03-05 02:15:28 +01:00
|
|
|
template<class _InputIterator,
|
|
|
|
typename = std::_RequireInputIter<_InputIterator>>
|
|
|
|
__versa_string&
|
stl_list.h (list<>::insert(iterator, size_type, const value_type&), [...]): Adjust C++11 signatures to take const_iterator(s).
2013-07-01 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/stl_list.h (list<>::insert(iterator,
size_type, const value_type&), list<>::insert(iterator,
initializer_list<>), list<>::insert(iterator, _InputIterator,
_InputIterator), list<>::splice(iterator, list&&),
list<>::splice(iterator, list&), list<>::splice(iterator, list&&,
iterator), list<>::splice(iterator, list&, iterator),
list<>::splice(iterator, list&&, iterator, iterator),
list<>::splice(iterator, list&, iterator, iterator)): Adjust C++11
signatures to take const_iterator(s).
* include/bits/list.tcc (list<>::insert(const_iterator, size_type,
const value_type&), list<>::insert(const_iterator, _InputIterator,
_InputIterator)): Define.
* include/ext/vstring.h (__versa_string<>::insert(iterator,
size_type, _CharT), __versa_string<>::insert(iterator,
_InputIterator, _InputIterator), __versa_string<>::insert(iterator,
std::initializer_list<>), __versa_string<>::replace(iterator,
iterator, _InputIterator, _InputIterator), __versa_string<>::
replace(iterator, iterator, std::initializer_list<>)): Adjust C++11
signatures to take const_iterator(s).
(__versa_string<>::_M_replace_dispatch): Take const_iterators.
* include/ext/vstring.tcc: Likewise.
* include/debug/list: Adjust.
* include/profile/list: Likewise.
* testsuite/23_containers/list/operations/splice/const_iterator.cc:
New.
* testsuite/23_containers/list/modifiers/insert/const_iterator.cc:
Extend.
* testsuite/ext/vstring/modifiers/insert/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/insert/wchar_t/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/wchar_t/const_iterator.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Adjust dg-error line number.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Likewise.
From-SVN: r200580
2013-07-01 18:17:46 +02:00
|
|
|
replace(const_iterator __i1, const_iterator __i2,
|
re PR libstdc++/43813 ([DR1234] vector<T*>(3, NULL) fails to compile)
2012-03-04 Paolo Carlini <paolo.carlini@oracle.com>
Jonathan Wakely <jwakely.gcc@gmail.com>
PR libstdc++/43813
* include/bits/stl_iterator_base_types.h (_RequireInputIter): New.
* include/ext/vstring.h (__versa_string<>::__versa_string
(_InputIterator, _InputIterator, const _Alloc&),
__versa_string<>::append(_InputIterator, _InputIterator),
__versa_string<>::assign(_InputIterator, _InputIterator),
__versa_string<>::insert(iterator, _InputIterator,
_InputIterator), __versa_string<>::replace(iterator, iterator,
_InputIterator, _InputIterator)): Use it.
* include/bits/stl_list.h (list<>::list(_InputIterator,
_InputIterator, const allocator_type&), list<>::assign(_InputIterator,
_InputIterator), list<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/stl_vector.h (vector<>::vector(_InputIterator,
_InputIterator, const allocator_type&), vector<>::assign(_InputIterator,
_InputIterator), vectort<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/stl_deque.h (deque<>::deque(_InputIterator,
_InputIterator, const allocator_type&), deque<>::deque(_InputIterator,
_InputIterator), deque<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/stl_bvector.h (vector<>::vector(_InputIterator,
_InputIterator, const allocator_type&), vector<>::deque(_InputIterator,
_InputIterator), vector<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/forward_list.h (forward_list<>::forward_list
(_InputIterator, _InputIterator, const allocator_type&),
forward_list<>::assign(_InputIterator, _InputIterator),
forward_list<>::insert_after(const_iterator, _InputIterator,
_InputIterator)): Likewise.
(forward_list<>::_M_initialize_dispatch(,, __true_type): Remove.
(forward_list<>::_M_range_initialize): Add, adjust everywhere.
* include/bits/forward_list.tcc: Adjust.
* include/debug/forward_list: Adjust.
* include/debug/vector: Likewise.
* include/debug/deque: Likewise.
* include/debug/list: Likewise.
* testsuite/ext/vstring/requirements/do_the_right_thing.cc: New.
* testsuite/23_containers/forward_list/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/vector/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/deque/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/list/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
assign_neg.cc: Adjust dg-error line number.
* testsuite/23_containers/forward_list/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
assign_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
assign_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
assign_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
Co-Authored-By: Jonathan Wakely <jwakely.gcc@gmail.com>
From-SVN: r184911
2012-03-05 02:15:28 +01:00
|
|
|
_InputIterator __k1, _InputIterator __k2)
|
|
|
|
{
|
|
|
|
_GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
|
|
|
|
&& __i2 <= _M_iend());
|
|
|
|
__glibcxx_requires_valid_range(__k1, __k2);
|
|
|
|
return this->_M_replace_dispatch(__i1, __i2, __k1, __k2,
|
|
|
|
std::__false_type());
|
|
|
|
}
|
|
|
|
#else
|
2005-07-06 01:07:18 +02:00
|
|
|
template<class _InputIterator>
|
|
|
|
__versa_string&
|
|
|
|
replace(iterator __i1, iterator __i2,
|
|
|
|
_InputIterator __k1, _InputIterator __k2)
|
|
|
|
{
|
|
|
|
_GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
|
|
|
|
&& __i2 <= _M_iend());
|
|
|
|
__glibcxx_requires_valid_range(__k1, __k2);
|
|
|
|
typedef typename std::__is_integer<_InputIterator>::__type _Integral;
|
2011-05-02 18:25:14 +02:00
|
|
|
return this->_M_replace_dispatch(__i1, __i2, __k1, __k2, _Integral());
|
2005-07-06 01:07:18 +02:00
|
|
|
}
|
re PR libstdc++/43813 ([DR1234] vector<T*>(3, NULL) fails to compile)
2012-03-04 Paolo Carlini <paolo.carlini@oracle.com>
Jonathan Wakely <jwakely.gcc@gmail.com>
PR libstdc++/43813
* include/bits/stl_iterator_base_types.h (_RequireInputIter): New.
* include/ext/vstring.h (__versa_string<>::__versa_string
(_InputIterator, _InputIterator, const _Alloc&),
__versa_string<>::append(_InputIterator, _InputIterator),
__versa_string<>::assign(_InputIterator, _InputIterator),
__versa_string<>::insert(iterator, _InputIterator,
_InputIterator), __versa_string<>::replace(iterator, iterator,
_InputIterator, _InputIterator)): Use it.
* include/bits/stl_list.h (list<>::list(_InputIterator,
_InputIterator, const allocator_type&), list<>::assign(_InputIterator,
_InputIterator), list<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/stl_vector.h (vector<>::vector(_InputIterator,
_InputIterator, const allocator_type&), vector<>::assign(_InputIterator,
_InputIterator), vectort<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/stl_deque.h (deque<>::deque(_InputIterator,
_InputIterator, const allocator_type&), deque<>::deque(_InputIterator,
_InputIterator), deque<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/stl_bvector.h (vector<>::vector(_InputIterator,
_InputIterator, const allocator_type&), vector<>::deque(_InputIterator,
_InputIterator), vector<>::insert(iterator, _InputIterator,
_InputIterator)): Likewise.
* include/bits/forward_list.h (forward_list<>::forward_list
(_InputIterator, _InputIterator, const allocator_type&),
forward_list<>::assign(_InputIterator, _InputIterator),
forward_list<>::insert_after(const_iterator, _InputIterator,
_InputIterator)): Likewise.
(forward_list<>::_M_initialize_dispatch(,, __true_type): Remove.
(forward_list<>::_M_range_initialize): Add, adjust everywhere.
* include/bits/forward_list.tcc: Adjust.
* include/debug/forward_list: Adjust.
* include/debug/vector: Likewise.
* include/debug/deque: Likewise.
* include/debug/list: Likewise.
* testsuite/ext/vstring/requirements/do_the_right_thing.cc: New.
* testsuite/23_containers/forward_list/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/vector/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/deque/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/list/requirements/
do_the_right_thing.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
assign_neg.cc: Adjust dg-error line number.
* testsuite/23_containers/forward_list/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
assign_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
assign_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
assign_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
Co-Authored-By: Jonathan Wakely <jwakely.gcc@gmail.com>
From-SVN: r184911
2012-03-05 02:15:28 +01:00
|
|
|
#endif
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
// Specializations for the common case of pointer and iterator:
|
|
|
|
// useful to avoid the overhead of temporary buffering in _M_replace.
|
|
|
|
__versa_string&
|
stl_list.h (list<>::insert(iterator, size_type, const value_type&), [...]): Adjust C++11 signatures to take const_iterator(s).
2013-07-01 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/stl_list.h (list<>::insert(iterator,
size_type, const value_type&), list<>::insert(iterator,
initializer_list<>), list<>::insert(iterator, _InputIterator,
_InputIterator), list<>::splice(iterator, list&&),
list<>::splice(iterator, list&), list<>::splice(iterator, list&&,
iterator), list<>::splice(iterator, list&, iterator),
list<>::splice(iterator, list&&, iterator, iterator),
list<>::splice(iterator, list&, iterator, iterator)): Adjust C++11
signatures to take const_iterator(s).
* include/bits/list.tcc (list<>::insert(const_iterator, size_type,
const value_type&), list<>::insert(const_iterator, _InputIterator,
_InputIterator)): Define.
* include/ext/vstring.h (__versa_string<>::insert(iterator,
size_type, _CharT), __versa_string<>::insert(iterator,
_InputIterator, _InputIterator), __versa_string<>::insert(iterator,
std::initializer_list<>), __versa_string<>::replace(iterator,
iterator, _InputIterator, _InputIterator), __versa_string<>::
replace(iterator, iterator, std::initializer_list<>)): Adjust C++11
signatures to take const_iterator(s).
(__versa_string<>::_M_replace_dispatch): Take const_iterators.
* include/ext/vstring.tcc: Likewise.
* include/debug/list: Adjust.
* include/profile/list: Likewise.
* testsuite/23_containers/list/operations/splice/const_iterator.cc:
New.
* testsuite/23_containers/list/modifiers/insert/const_iterator.cc:
Extend.
* testsuite/ext/vstring/modifiers/insert/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/insert/wchar_t/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/wchar_t/const_iterator.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Adjust dg-error line number.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Likewise.
From-SVN: r200580
2013-07-01 18:17:46 +02:00
|
|
|
#if __cplusplus >= 201103L
|
|
|
|
replace(const_iterator __i1, const_iterator __i2,
|
|
|
|
_CharT* __k1, _CharT* __k2)
|
|
|
|
#else
|
|
|
|
replace(iterator __i1, iterator __i2,
|
|
|
|
_CharT* __k1, _CharT* __k2)
|
|
|
|
#endif
|
2005-07-06 01:07:18 +02:00
|
|
|
{
|
|
|
|
_GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
|
|
|
|
&& __i2 <= _M_iend());
|
|
|
|
__glibcxx_requires_valid_range(__k1, __k2);
|
|
|
|
return this->replace(__i1 - _M_ibegin(), __i2 - __i1,
|
|
|
|
__k1, __k2 - __k1);
|
|
|
|
}
|
|
|
|
|
|
|
|
__versa_string&
|
stl_list.h (list<>::insert(iterator, size_type, const value_type&), [...]): Adjust C++11 signatures to take const_iterator(s).
2013-07-01 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/stl_list.h (list<>::insert(iterator,
size_type, const value_type&), list<>::insert(iterator,
initializer_list<>), list<>::insert(iterator, _InputIterator,
_InputIterator), list<>::splice(iterator, list&&),
list<>::splice(iterator, list&), list<>::splice(iterator, list&&,
iterator), list<>::splice(iterator, list&, iterator),
list<>::splice(iterator, list&&, iterator, iterator),
list<>::splice(iterator, list&, iterator, iterator)): Adjust C++11
signatures to take const_iterator(s).
* include/bits/list.tcc (list<>::insert(const_iterator, size_type,
const value_type&), list<>::insert(const_iterator, _InputIterator,
_InputIterator)): Define.
* include/ext/vstring.h (__versa_string<>::insert(iterator,
size_type, _CharT), __versa_string<>::insert(iterator,
_InputIterator, _InputIterator), __versa_string<>::insert(iterator,
std::initializer_list<>), __versa_string<>::replace(iterator,
iterator, _InputIterator, _InputIterator), __versa_string<>::
replace(iterator, iterator, std::initializer_list<>)): Adjust C++11
signatures to take const_iterator(s).
(__versa_string<>::_M_replace_dispatch): Take const_iterators.
* include/ext/vstring.tcc: Likewise.
* include/debug/list: Adjust.
* include/profile/list: Likewise.
* testsuite/23_containers/list/operations/splice/const_iterator.cc:
New.
* testsuite/23_containers/list/modifiers/insert/const_iterator.cc:
Extend.
* testsuite/ext/vstring/modifiers/insert/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/insert/wchar_t/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/wchar_t/const_iterator.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Adjust dg-error line number.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Likewise.
From-SVN: r200580
2013-07-01 18:17:46 +02:00
|
|
|
#if __cplusplus >= 201103L
|
|
|
|
replace(const_iterator __i1, const_iterator __i2,
|
|
|
|
const _CharT* __k1, const _CharT* __k2)
|
|
|
|
#else
|
2005-07-06 01:07:18 +02:00
|
|
|
replace(iterator __i1, iterator __i2,
|
|
|
|
const _CharT* __k1, const _CharT* __k2)
|
stl_list.h (list<>::insert(iterator, size_type, const value_type&), [...]): Adjust C++11 signatures to take const_iterator(s).
2013-07-01 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/stl_list.h (list<>::insert(iterator,
size_type, const value_type&), list<>::insert(iterator,
initializer_list<>), list<>::insert(iterator, _InputIterator,
_InputIterator), list<>::splice(iterator, list&&),
list<>::splice(iterator, list&), list<>::splice(iterator, list&&,
iterator), list<>::splice(iterator, list&, iterator),
list<>::splice(iterator, list&&, iterator, iterator),
list<>::splice(iterator, list&, iterator, iterator)): Adjust C++11
signatures to take const_iterator(s).
* include/bits/list.tcc (list<>::insert(const_iterator, size_type,
const value_type&), list<>::insert(const_iterator, _InputIterator,
_InputIterator)): Define.
* include/ext/vstring.h (__versa_string<>::insert(iterator,
size_type, _CharT), __versa_string<>::insert(iterator,
_InputIterator, _InputIterator), __versa_string<>::insert(iterator,
std::initializer_list<>), __versa_string<>::replace(iterator,
iterator, _InputIterator, _InputIterator), __versa_string<>::
replace(iterator, iterator, std::initializer_list<>)): Adjust C++11
signatures to take const_iterator(s).
(__versa_string<>::_M_replace_dispatch): Take const_iterators.
* include/ext/vstring.tcc: Likewise.
* include/debug/list: Adjust.
* include/profile/list: Likewise.
* testsuite/23_containers/list/operations/splice/const_iterator.cc:
New.
* testsuite/23_containers/list/modifiers/insert/const_iterator.cc:
Extend.
* testsuite/ext/vstring/modifiers/insert/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/insert/wchar_t/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/wchar_t/const_iterator.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Adjust dg-error line number.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Likewise.
From-SVN: r200580
2013-07-01 18:17:46 +02:00
|
|
|
#endif
|
2005-07-06 01:07:18 +02:00
|
|
|
{
|
|
|
|
_GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
|
|
|
|
&& __i2 <= _M_iend());
|
|
|
|
__glibcxx_requires_valid_range(__k1, __k2);
|
|
|
|
return this->replace(__i1 - _M_ibegin(), __i2 - __i1,
|
|
|
|
__k1, __k2 - __k1);
|
|
|
|
}
|
|
|
|
|
|
|
|
__versa_string&
|
stl_list.h (list<>::insert(iterator, size_type, const value_type&), [...]): Adjust C++11 signatures to take const_iterator(s).
2013-07-01 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/stl_list.h (list<>::insert(iterator,
size_type, const value_type&), list<>::insert(iterator,
initializer_list<>), list<>::insert(iterator, _InputIterator,
_InputIterator), list<>::splice(iterator, list&&),
list<>::splice(iterator, list&), list<>::splice(iterator, list&&,
iterator), list<>::splice(iterator, list&, iterator),
list<>::splice(iterator, list&&, iterator, iterator),
list<>::splice(iterator, list&, iterator, iterator)): Adjust C++11
signatures to take const_iterator(s).
* include/bits/list.tcc (list<>::insert(const_iterator, size_type,
const value_type&), list<>::insert(const_iterator, _InputIterator,
_InputIterator)): Define.
* include/ext/vstring.h (__versa_string<>::insert(iterator,
size_type, _CharT), __versa_string<>::insert(iterator,
_InputIterator, _InputIterator), __versa_string<>::insert(iterator,
std::initializer_list<>), __versa_string<>::replace(iterator,
iterator, _InputIterator, _InputIterator), __versa_string<>::
replace(iterator, iterator, std::initializer_list<>)): Adjust C++11
signatures to take const_iterator(s).
(__versa_string<>::_M_replace_dispatch): Take const_iterators.
* include/ext/vstring.tcc: Likewise.
* include/debug/list: Adjust.
* include/profile/list: Likewise.
* testsuite/23_containers/list/operations/splice/const_iterator.cc:
New.
* testsuite/23_containers/list/modifiers/insert/const_iterator.cc:
Extend.
* testsuite/ext/vstring/modifiers/insert/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/insert/wchar_t/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/wchar_t/const_iterator.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Adjust dg-error line number.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Likewise.
From-SVN: r200580
2013-07-01 18:17:46 +02:00
|
|
|
#if __cplusplus >= 201103L
|
|
|
|
replace(const_iterator __i1, const_iterator __i2,
|
|
|
|
iterator __k1, iterator __k2)
|
|
|
|
#else
|
|
|
|
replace(iterator __i1, iterator __i2,
|
|
|
|
iterator __k1, iterator __k2)
|
|
|
|
#endif
|
2005-07-06 01:07:18 +02:00
|
|
|
{
|
|
|
|
_GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
|
|
|
|
&& __i2 <= _M_iend());
|
|
|
|
__glibcxx_requires_valid_range(__k1, __k2);
|
|
|
|
return this->replace(__i1 - _M_ibegin(), __i2 - __i1,
|
|
|
|
__k1.base(), __k2 - __k1);
|
|
|
|
}
|
|
|
|
|
|
|
|
__versa_string&
|
stl_list.h (list<>::insert(iterator, size_type, const value_type&), [...]): Adjust C++11 signatures to take const_iterator(s).
2013-07-01 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/stl_list.h (list<>::insert(iterator,
size_type, const value_type&), list<>::insert(iterator,
initializer_list<>), list<>::insert(iterator, _InputIterator,
_InputIterator), list<>::splice(iterator, list&&),
list<>::splice(iterator, list&), list<>::splice(iterator, list&&,
iterator), list<>::splice(iterator, list&, iterator),
list<>::splice(iterator, list&&, iterator, iterator),
list<>::splice(iterator, list&, iterator, iterator)): Adjust C++11
signatures to take const_iterator(s).
* include/bits/list.tcc (list<>::insert(const_iterator, size_type,
const value_type&), list<>::insert(const_iterator, _InputIterator,
_InputIterator)): Define.
* include/ext/vstring.h (__versa_string<>::insert(iterator,
size_type, _CharT), __versa_string<>::insert(iterator,
_InputIterator, _InputIterator), __versa_string<>::insert(iterator,
std::initializer_list<>), __versa_string<>::replace(iterator,
iterator, _InputIterator, _InputIterator), __versa_string<>::
replace(iterator, iterator, std::initializer_list<>)): Adjust C++11
signatures to take const_iterator(s).
(__versa_string<>::_M_replace_dispatch): Take const_iterators.
* include/ext/vstring.tcc: Likewise.
* include/debug/list: Adjust.
* include/profile/list: Likewise.
* testsuite/23_containers/list/operations/splice/const_iterator.cc:
New.
* testsuite/23_containers/list/modifiers/insert/const_iterator.cc:
Extend.
* testsuite/ext/vstring/modifiers/insert/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/insert/wchar_t/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/wchar_t/const_iterator.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Adjust dg-error line number.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Likewise.
From-SVN: r200580
2013-07-01 18:17:46 +02:00
|
|
|
#if __cplusplus >= 201103L
|
|
|
|
replace(const_iterator __i1, const_iterator __i2,
|
|
|
|
const_iterator __k1, const_iterator __k2)
|
|
|
|
#else
|
2005-07-06 01:07:18 +02:00
|
|
|
replace(iterator __i1, iterator __i2,
|
|
|
|
const_iterator __k1, const_iterator __k2)
|
stl_list.h (list<>::insert(iterator, size_type, const value_type&), [...]): Adjust C++11 signatures to take const_iterator(s).
2013-07-01 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/stl_list.h (list<>::insert(iterator,
size_type, const value_type&), list<>::insert(iterator,
initializer_list<>), list<>::insert(iterator, _InputIterator,
_InputIterator), list<>::splice(iterator, list&&),
list<>::splice(iterator, list&), list<>::splice(iterator, list&&,
iterator), list<>::splice(iterator, list&, iterator),
list<>::splice(iterator, list&&, iterator, iterator),
list<>::splice(iterator, list&, iterator, iterator)): Adjust C++11
signatures to take const_iterator(s).
* include/bits/list.tcc (list<>::insert(const_iterator, size_type,
const value_type&), list<>::insert(const_iterator, _InputIterator,
_InputIterator)): Define.
* include/ext/vstring.h (__versa_string<>::insert(iterator,
size_type, _CharT), __versa_string<>::insert(iterator,
_InputIterator, _InputIterator), __versa_string<>::insert(iterator,
std::initializer_list<>), __versa_string<>::replace(iterator,
iterator, _InputIterator, _InputIterator), __versa_string<>::
replace(iterator, iterator, std::initializer_list<>)): Adjust C++11
signatures to take const_iterator(s).
(__versa_string<>::_M_replace_dispatch): Take const_iterators.
* include/ext/vstring.tcc: Likewise.
* include/debug/list: Adjust.
* include/profile/list: Likewise.
* testsuite/23_containers/list/operations/splice/const_iterator.cc:
New.
* testsuite/23_containers/list/modifiers/insert/const_iterator.cc:
Extend.
* testsuite/ext/vstring/modifiers/insert/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/insert/wchar_t/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/wchar_t/const_iterator.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Adjust dg-error line number.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Likewise.
From-SVN: r200580
2013-07-01 18:17:46 +02:00
|
|
|
#endif
|
2005-07-06 01:07:18 +02:00
|
|
|
{
|
|
|
|
_GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
|
|
|
|
&& __i2 <= _M_iend());
|
|
|
|
__glibcxx_requires_valid_range(__k1, __k2);
|
|
|
|
return this->replace(__i1 - _M_ibegin(), __i2 - __i1,
|
|
|
|
__k1.base(), __k2 - __k1);
|
|
|
|
}
|
|
|
|
|
2012-11-10 18:27:22 +01:00
|
|
|
#if __cplusplus >= 201103L
|
2008-07-21 21:40:39 +02:00
|
|
|
/**
|
|
|
|
* @brief Replace range of characters with initializer_list.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __i1 Iterator referencing start of range to replace.
|
|
|
|
* @param __i2 Iterator referencing end of range to replace.
|
|
|
|
* @param __l The initializer_list of characters to insert.
|
2008-07-21 21:40:39 +02:00
|
|
|
* @return Reference to this string.
|
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Removes the characters in the range [i1,i2). In place,
|
|
|
|
* characters in the range [k1,k2) are inserted. If the length
|
|
|
|
* of result exceeds max_size(), length_error is thrown. The
|
|
|
|
* value of the string doesn't change if an error is thrown.
|
2008-07-21 21:40:39 +02:00
|
|
|
*/
|
stl_list.h (list<>::insert(iterator, size_type, const value_type&), [...]): Adjust C++11 signatures to take const_iterator(s).
2013-07-01 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/stl_list.h (list<>::insert(iterator,
size_type, const value_type&), list<>::insert(iterator,
initializer_list<>), list<>::insert(iterator, _InputIterator,
_InputIterator), list<>::splice(iterator, list&&),
list<>::splice(iterator, list&), list<>::splice(iterator, list&&,
iterator), list<>::splice(iterator, list&, iterator),
list<>::splice(iterator, list&&, iterator, iterator),
list<>::splice(iterator, list&, iterator, iterator)): Adjust C++11
signatures to take const_iterator(s).
* include/bits/list.tcc (list<>::insert(const_iterator, size_type,
const value_type&), list<>::insert(const_iterator, _InputIterator,
_InputIterator)): Define.
* include/ext/vstring.h (__versa_string<>::insert(iterator,
size_type, _CharT), __versa_string<>::insert(iterator,
_InputIterator, _InputIterator), __versa_string<>::insert(iterator,
std::initializer_list<>), __versa_string<>::replace(iterator,
iterator, _InputIterator, _InputIterator), __versa_string<>::
replace(iterator, iterator, std::initializer_list<>)): Adjust C++11
signatures to take const_iterator(s).
(__versa_string<>::_M_replace_dispatch): Take const_iterators.
* include/ext/vstring.tcc: Likewise.
* include/debug/list: Adjust.
* include/profile/list: Likewise.
* testsuite/23_containers/list/operations/splice/const_iterator.cc:
New.
* testsuite/23_containers/list/modifiers/insert/const_iterator.cc:
Extend.
* testsuite/ext/vstring/modifiers/insert/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/insert/wchar_t/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/wchar_t/const_iterator.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Adjust dg-error line number.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Likewise.
From-SVN: r200580
2013-07-01 18:17:46 +02:00
|
|
|
__versa_string&
|
|
|
|
replace(const_iterator __i1, const_iterator __i2,
|
|
|
|
std::initializer_list<_CharT> __l)
|
2008-07-21 21:40:39 +02:00
|
|
|
{ return this->replace(__i1, __i2, __l.begin(), __l.end()); }
|
2012-11-10 18:27:22 +01:00
|
|
|
#endif // C++11
|
2008-07-21 21:40:39 +02:00
|
|
|
|
2005-07-06 01:07:18 +02:00
|
|
|
private:
|
|
|
|
template<class _Integer>
|
|
|
|
__versa_string&
|
stl_list.h (list<>::insert(iterator, size_type, const value_type&), [...]): Adjust C++11 signatures to take const_iterator(s).
2013-07-01 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/stl_list.h (list<>::insert(iterator,
size_type, const value_type&), list<>::insert(iterator,
initializer_list<>), list<>::insert(iterator, _InputIterator,
_InputIterator), list<>::splice(iterator, list&&),
list<>::splice(iterator, list&), list<>::splice(iterator, list&&,
iterator), list<>::splice(iterator, list&, iterator),
list<>::splice(iterator, list&&, iterator, iterator),
list<>::splice(iterator, list&, iterator, iterator)): Adjust C++11
signatures to take const_iterator(s).
* include/bits/list.tcc (list<>::insert(const_iterator, size_type,
const value_type&), list<>::insert(const_iterator, _InputIterator,
_InputIterator)): Define.
* include/ext/vstring.h (__versa_string<>::insert(iterator,
size_type, _CharT), __versa_string<>::insert(iterator,
_InputIterator, _InputIterator), __versa_string<>::insert(iterator,
std::initializer_list<>), __versa_string<>::replace(iterator,
iterator, _InputIterator, _InputIterator), __versa_string<>::
replace(iterator, iterator, std::initializer_list<>)): Adjust C++11
signatures to take const_iterator(s).
(__versa_string<>::_M_replace_dispatch): Take const_iterators.
* include/ext/vstring.tcc: Likewise.
* include/debug/list: Adjust.
* include/profile/list: Likewise.
* testsuite/23_containers/list/operations/splice/const_iterator.cc:
New.
* testsuite/23_containers/list/modifiers/insert/const_iterator.cc:
Extend.
* testsuite/ext/vstring/modifiers/insert/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/insert/wchar_t/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/wchar_t/const_iterator.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Adjust dg-error line number.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Likewise.
From-SVN: r200580
2013-07-01 18:17:46 +02:00
|
|
|
_M_replace_dispatch(const_iterator __i1, const_iterator __i2,
|
|
|
|
_Integer __n, _Integer __val, std::__true_type)
|
2005-07-06 01:07:18 +02:00
|
|
|
{ return _M_replace_aux(__i1 - _M_ibegin(), __i2 - __i1, __n, __val); }
|
|
|
|
|
|
|
|
template<class _InputIterator>
|
|
|
|
__versa_string&
|
stl_list.h (list<>::insert(iterator, size_type, const value_type&), [...]): Adjust C++11 signatures to take const_iterator(s).
2013-07-01 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/stl_list.h (list<>::insert(iterator,
size_type, const value_type&), list<>::insert(iterator,
initializer_list<>), list<>::insert(iterator, _InputIterator,
_InputIterator), list<>::splice(iterator, list&&),
list<>::splice(iterator, list&), list<>::splice(iterator, list&&,
iterator), list<>::splice(iterator, list&, iterator),
list<>::splice(iterator, list&&, iterator, iterator),
list<>::splice(iterator, list&, iterator, iterator)): Adjust C++11
signatures to take const_iterator(s).
* include/bits/list.tcc (list<>::insert(const_iterator, size_type,
const value_type&), list<>::insert(const_iterator, _InputIterator,
_InputIterator)): Define.
* include/ext/vstring.h (__versa_string<>::insert(iterator,
size_type, _CharT), __versa_string<>::insert(iterator,
_InputIterator, _InputIterator), __versa_string<>::insert(iterator,
std::initializer_list<>), __versa_string<>::replace(iterator,
iterator, _InputIterator, _InputIterator), __versa_string<>::
replace(iterator, iterator, std::initializer_list<>)): Adjust C++11
signatures to take const_iterator(s).
(__versa_string<>::_M_replace_dispatch): Take const_iterators.
* include/ext/vstring.tcc: Likewise.
* include/debug/list: Adjust.
* include/profile/list: Likewise.
* testsuite/23_containers/list/operations/splice/const_iterator.cc:
New.
* testsuite/23_containers/list/modifiers/insert/const_iterator.cc:
Extend.
* testsuite/ext/vstring/modifiers/insert/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/insert/wchar_t/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/char/const_iterator.cc:
Likewise.
* testsuite/ext/vstring/modifiers/replace/wchar_t/const_iterator.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Adjust dg-error line number.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Likewise.
From-SVN: r200580
2013-07-01 18:17:46 +02:00
|
|
|
_M_replace_dispatch(const_iterator __i1, const_iterator __i2,
|
|
|
|
_InputIterator __k1, _InputIterator __k2,
|
|
|
|
std::__false_type);
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
__versa_string&
|
|
|
|
_M_replace_aux(size_type __pos1, size_type __n1, size_type __n2,
|
|
|
|
_CharT __c);
|
|
|
|
|
|
|
|
__versa_string&
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
_M_replace(size_type __pos, size_type __len1, const _CharT* __s,
|
|
|
|
const size_type __len2);
|
|
|
|
|
|
|
|
__versa_string&
|
|
|
|
_M_append(const _CharT* __s, size_type __n);
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
public:
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Copy substring into C string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __s C string to copy value into.
|
|
|
|
* @param __n Number of characters to copy.
|
|
|
|
* @param __pos Index of first character to copy.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Number of characters actually copied
|
|
|
|
* @throw std::out_of_range If pos > size().
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Copies up to @a __n characters starting at @a __pos into the
|
|
|
|
* C string @a s. If @a __pos is greater than size(),
|
|
|
|
* out_of_range is thrown.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
copy(_CharT* __s, size_type __n, size_type __pos = 0) const;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Swap contents with another string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __s String to swap with.
|
2005-07-06 01:07:18 +02:00
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Exchanges the contents of this string with that of @a __s in
|
|
|
|
* constant time.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
void
|
rc_string_base.h (__rc_string_base<>::_Rep): Avoid the anonymous struct extension, adjust everywhere.
2005-11-18 Paolo Carlini <pcarlini@suse.de>
* include/ext/rc_string_base.h (__rc_string_base<>::_Rep): Avoid the
anonymous struct extension, adjust everywhere.
* include/ext/rc_string_base.h (__rc_string_base<>::_S_empty_rep()):
Just use a static member.
(__rc_string_base<>::__rc_string_base(), _S_construct): Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_Rep): Use anonymous
union together with _CharT to fix alignment issues, rebind to _Rep and
rename _Raw_alloc to _Rep_alloc_type.
(__rc_string_base<>::_Rep::_S_create, _M_destroy): Adjust consistently.
* include/ext/vstring_util.h (__is_null_p): Move inside struct
__vstring_utility as static _S_is_null_pointer.
* include/ext/sso_string.h
(__sso_string_base<>::_M_construct(std::forward_iterator_tag): Adjust.
* include/ext/rc_string_base.h
(__rc_string_base<>::_S_construct(std::forward_iterator_tag): Likewise.
Implement Option 3 of DR 431 for ext/vstring - both available bases.
* include/bits/cpp_type_traits.h (struct __is_empty): Add.
* include/ext/vstring.h (__versa_string<>::swap): Delegate to
this->_M_swap.
* include/ext/vstring.tcc (__versa_string<>::swap): Remove.
* include/ext/vstring_util.h (struct __vstring_utility<>): Add struct
_Alloc_hider<>, augmented of allocator swapping facility, specialized
to nop for empty allocators.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_swap): Use it.
(__rc_string_base<>::_M_is_leaked, _M_set_sharable): Change to private.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_swap):
Likewise.
(__sso_string_base<>::_M_is_leaked, _M_set_sharable): Remove, unused.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_data(_CharT*):
Return void.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_data(_CharT*):
Likewise.
From-SVN: r107176
2005-11-18 12:50:22 +01:00
|
|
|
swap(__versa_string& __s)
|
|
|
|
{ this->_M_swap(__s); }
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
// String operations:
|
|
|
|
/**
|
|
|
|
* @brief Return const pointer to null-terminated contents.
|
|
|
|
*
|
|
|
|
* This is a handle to internal data. Do not modify or dire things may
|
|
|
|
* happen.
|
|
|
|
*/
|
|
|
|
const _CharT*
|
2011-05-31 14:50:31 +02:00
|
|
|
c_str() const _GLIBCXX_NOEXCEPT
|
2005-07-06 01:07:18 +02:00
|
|
|
{ return this->_M_data(); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Return const pointer to contents.
|
|
|
|
*
|
|
|
|
* This is a handle to internal data. Do not modify or dire things may
|
|
|
|
* happen.
|
|
|
|
*/
|
|
|
|
const _CharT*
|
2011-05-31 14:50:31 +02:00
|
|
|
data() const _GLIBCXX_NOEXCEPT
|
2005-07-06 01:07:18 +02:00
|
|
|
{ return this->_M_data(); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Return copy of allocator used to construct this string.
|
|
|
|
*/
|
|
|
|
allocator_type
|
2011-05-31 14:50:31 +02:00
|
|
|
get_allocator() const _GLIBCXX_NOEXCEPT
|
2006-01-04 12:34:45 +01:00
|
|
|
{ return allocator_type(this->_M_get_allocator()); }
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find position of a C substring.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __s C string to locate.
|
|
|
|
* @param __pos Index of character to search from.
|
|
|
|
* @param __n Number of characters from @a __s to search for.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Index of start of first occurrence.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Starting from @a __pos, searches forward for the first @a
|
|
|
|
* __n characters in @a __s within this string. If found,
|
|
|
|
* returns the index where it begins. If not found, returns
|
|
|
|
* npos.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
find(const _CharT* __s, size_type __pos, size_type __n) const;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find position of a string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __str String to locate.
|
|
|
|
* @param __pos Index of character to search from (default 0).
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Index of start of first occurrence.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Starting from @a __pos, searches forward for value of @a
|
|
|
|
* __str within this string. If found, returns the index where
|
|
|
|
* it begins. If not found, returns npos.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
find(const __versa_string& __str, size_type __pos = 0) const
|
2011-05-31 14:50:31 +02:00
|
|
|
_GLIBCXX_NOEXCEPT
|
2005-07-06 01:07:18 +02:00
|
|
|
{ return this->find(__str.data(), __pos, __str.size()); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find position of a C string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __s C string to locate.
|
|
|
|
* @param __pos Index of character to search from (default 0).
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Index of start of first occurrence.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Starting from @a __pos, searches forward for the value of @a
|
|
|
|
* __s within this string. If found, returns the index where
|
|
|
|
* it begins. If not found, returns npos.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
find(const _CharT* __s, size_type __pos = 0) const
|
|
|
|
{
|
|
|
|
__glibcxx_requires_string(__s);
|
|
|
|
return this->find(__s, __pos, traits_type::length(__s));
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find position of a character.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __c Character to locate.
|
|
|
|
* @param __pos Index of character to search from (default 0).
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Index of first occurrence.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Starting from @a __pos, searches forward for @a __c within
|
|
|
|
* this string. If found, returns the index where it was
|
|
|
|
* found. If not found, returns npos.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
size_type
|
2011-05-31 14:50:31 +02:00
|
|
|
find(_CharT __c, size_type __pos = 0) const _GLIBCXX_NOEXCEPT;
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find last position of a string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __str String to locate.
|
|
|
|
* @param __pos Index of character to search back from (default end).
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Index of start of last occurrence.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Starting from @a __pos, searches backward for value of @a
|
|
|
|
* __str within this string. If found, returns the index where
|
|
|
|
* it begins. If not found, returns npos.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
rfind(const __versa_string& __str, size_type __pos = npos) const
|
2011-05-31 14:50:31 +02:00
|
|
|
_GLIBCXX_NOEXCEPT
|
2005-07-06 01:07:18 +02:00
|
|
|
{ return this->rfind(__str.data(), __pos, __str.size()); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find last position of a C substring.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __s C string to locate.
|
|
|
|
* @param __pos Index of character to search back from.
|
|
|
|
* @param __n Number of characters from s to search for.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Index of start of last occurrence.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Starting from @a __pos, searches backward for the first @a
|
|
|
|
* __n characters in @a __s within this string. If found,
|
|
|
|
* returns the index where it begins. If not found, returns
|
|
|
|
* npos.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
rfind(const _CharT* __s, size_type __pos, size_type __n) const;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find last position of a C string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __s C string to locate.
|
|
|
|
* @param __pos Index of character to start search at (default end).
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Index of start of last occurrence.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Starting from @a __pos, searches backward for the value of
|
|
|
|
* @a __s within this string. If found, returns the index
|
|
|
|
* where it begins. If not found, returns npos.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
rfind(const _CharT* __s, size_type __pos = npos) const
|
|
|
|
{
|
|
|
|
__glibcxx_requires_string(__s);
|
|
|
|
return this->rfind(__s, __pos, traits_type::length(__s));
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find last position of a character.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __c Character to locate.
|
|
|
|
* @param __pos Index of character to search back from (default end).
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Index of last occurrence.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Starting from @a __pos, searches backward for @a __c within
|
|
|
|
* this string. If found, returns the index where it was
|
|
|
|
* found. If not found, returns npos.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
size_type
|
2011-05-31 14:50:31 +02:00
|
|
|
rfind(_CharT __c, size_type __pos = npos) const _GLIBCXX_NOEXCEPT;
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find position of a character of string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __str String containing characters to locate.
|
|
|
|
* @param __pos Index of character to search from (default 0).
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Index of first occurrence.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Starting from @a __pos, searches forward for one of the characters of
|
|
|
|
* @a __str within this string. If found, returns the index where it was
|
2005-07-06 01:07:18 +02:00
|
|
|
* found. If not found, returns npos.
|
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
find_first_of(const __versa_string& __str, size_type __pos = 0) const
|
2011-05-31 14:50:31 +02:00
|
|
|
_GLIBCXX_NOEXCEPT
|
2005-07-06 01:07:18 +02:00
|
|
|
{ return this->find_first_of(__str.data(), __pos, __str.size()); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find position of a character of C substring.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __s String containing characters to locate.
|
|
|
|
* @param __pos Index of character to search from.
|
|
|
|
* @param __n Number of characters from s to search for.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Index of first occurrence.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Starting from @a __pos, searches forward for one of the
|
|
|
|
* first @a __n characters of @a __s within this string. If
|
|
|
|
* found, returns the index where it was found. If not found,
|
|
|
|
* returns npos.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
find_first_of(const _CharT* __s, size_type __pos, size_type __n) const;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find position of a character of C string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __s String containing characters to locate.
|
|
|
|
* @param __pos Index of character to search from (default 0).
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Index of first occurrence.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Starting from @a __pos, searches forward for one of the
|
|
|
|
* characters of @a __s within this string. If found, returns
|
|
|
|
* the index where it was found. If not found, returns npos.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
find_first_of(const _CharT* __s, size_type __pos = 0) const
|
|
|
|
{
|
|
|
|
__glibcxx_requires_string(__s);
|
|
|
|
return this->find_first_of(__s, __pos, traits_type::length(__s));
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find position of a character.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __c Character to locate.
|
|
|
|
* @param __pos Index of character to search from (default 0).
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Index of first occurrence.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Starting from @a __pos, searches forward for the character
|
|
|
|
* @a __c within this string. If found, returns the index
|
|
|
|
* where it was found. If not found, returns npos.
|
2005-07-06 01:07:18 +02:00
|
|
|
*
|
|
|
|
* Note: equivalent to find(c, pos).
|
|
|
|
*/
|
|
|
|
size_type
|
2011-05-31 14:50:31 +02:00
|
|
|
find_first_of(_CharT __c, size_type __pos = 0) const _GLIBCXX_NOEXCEPT
|
2005-07-06 01:07:18 +02:00
|
|
|
{ return this->find(__c, __pos); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find last position of a character of string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __str String containing characters to locate.
|
|
|
|
* @param __pos Index of character to search back from (default end).
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Index of last occurrence.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Starting from @a __pos, searches backward for one of the
|
|
|
|
* characters of @a __str within this string. If found,
|
|
|
|
* returns the index where it was found. If not found, returns
|
|
|
|
* npos.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
find_last_of(const __versa_string& __str, size_type __pos = npos) const
|
2011-05-31 14:50:31 +02:00
|
|
|
_GLIBCXX_NOEXCEPT
|
2005-07-06 01:07:18 +02:00
|
|
|
{ return this->find_last_of(__str.data(), __pos, __str.size()); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find last position of a character of C substring.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __s C string containing characters to locate.
|
|
|
|
* @param __pos Index of character to search back from.
|
|
|
|
* @param __n Number of characters from s to search for.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Index of last occurrence.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Starting from @a __pos, searches backward for one of the
|
|
|
|
* first @a __n characters of @a __s within this string. If
|
|
|
|
* found, returns the index where it was found. If not found,
|
|
|
|
* returns npos.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
find_last_of(const _CharT* __s, size_type __pos, size_type __n) const;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find last position of a character of C string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __s C string containing characters to locate.
|
|
|
|
* @param __pos Index of character to search back from (default end).
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Index of last occurrence.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Starting from @a __pos, searches backward for one of the
|
|
|
|
* characters of @a __s within this string. If found, returns
|
|
|
|
* the index where it was found. If not found, returns npos.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
find_last_of(const _CharT* __s, size_type __pos = npos) const
|
|
|
|
{
|
|
|
|
__glibcxx_requires_string(__s);
|
|
|
|
return this->find_last_of(__s, __pos, traits_type::length(__s));
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find last position of a character.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __c Character to locate.
|
|
|
|
* @param __pos Index of character to search back from (default end).
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Index of last occurrence.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Starting from @a __pos, searches backward for @a __c within
|
|
|
|
* this string. If found, returns the index where it was
|
|
|
|
* found. If not found, returns npos.
|
2005-07-06 01:07:18 +02:00
|
|
|
*
|
|
|
|
* Note: equivalent to rfind(c, pos).
|
|
|
|
*/
|
|
|
|
size_type
|
2011-05-31 14:50:31 +02:00
|
|
|
find_last_of(_CharT __c, size_type __pos = npos) const _GLIBCXX_NOEXCEPT
|
2005-07-06 01:07:18 +02:00
|
|
|
{ return this->rfind(__c, __pos); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find position of a character not in string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __str String containing characters to avoid.
|
|
|
|
* @param __pos Index of character to search from (default 0).
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Index of first occurrence.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Starting from @a __pos, searches forward for a character not
|
|
|
|
* contained in @a __str within this string. If found, returns
|
|
|
|
* the index where it was found. If not found, returns npos.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
find_first_not_of(const __versa_string& __str, size_type __pos = 0) const
|
2011-05-31 14:50:31 +02:00
|
|
|
_GLIBCXX_NOEXCEPT
|
2005-07-06 01:07:18 +02:00
|
|
|
{ return this->find_first_not_of(__str.data(), __pos, __str.size()); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find position of a character not in C substring.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __s C string containing characters to avoid.
|
|
|
|
* @param __pos Index of character to search from.
|
|
|
|
* @param __n Number of characters from s to consider.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Index of first occurrence.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Starting from @a __pos, searches forward for a character not
|
|
|
|
* contained in the first @a __n characters of @a __s within
|
|
|
|
* this string. If found, returns the index where it was
|
|
|
|
* found. If not found, returns npos.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
find_first_not_of(const _CharT* __s, size_type __pos,
|
|
|
|
size_type __n) const;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find position of a character not in C string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __s C string containing characters to avoid.
|
|
|
|
* @param __pos Index of character to search from (default 0).
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Index of first occurrence.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Starting from @a __pos, searches forward for a character not
|
|
|
|
* contained in @a __s within this string. If found, returns
|
|
|
|
* the index where it was found. If not found, returns npos.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
find_first_not_of(const _CharT* __s, size_type __pos = 0) const
|
|
|
|
{
|
|
|
|
__glibcxx_requires_string(__s);
|
|
|
|
return this->find_first_not_of(__s, __pos, traits_type::length(__s));
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find position of a different character.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __c Character to avoid.
|
|
|
|
* @param __pos Index of character to search from (default 0).
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Index of first occurrence.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Starting from @a __pos, searches forward for a character
|
|
|
|
* other than @a __c within this string. If found, returns the
|
|
|
|
* index where it was found. If not found, returns npos.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
size_type
|
2011-05-31 14:50:31 +02:00
|
|
|
find_first_not_of(_CharT __c, size_type __pos = 0) const
|
|
|
|
_GLIBCXX_NOEXCEPT;
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find last position of a character not in string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __str String containing characters to avoid.
|
|
|
|
* @param __pos Index of character to search back from (default end).
|
2007-10-01 22:49:39 +02:00
|
|
|
* @return Index of last occurrence.
|
2005-07-06 01:07:18 +02:00
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Starting from @a __pos, searches backward for a character
|
|
|
|
* not contained in @a __str within this string. If found,
|
|
|
|
* returns the index where it was found. If not found, returns
|
|
|
|
* npos.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
find_last_not_of(const __versa_string& __str,
|
2011-05-31 14:50:31 +02:00
|
|
|
size_type __pos = npos) const _GLIBCXX_NOEXCEPT
|
2005-07-06 01:07:18 +02:00
|
|
|
{ return this->find_last_not_of(__str.data(), __pos, __str.size()); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find last position of a character not in C substring.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __s C string containing characters to avoid.
|
|
|
|
* @param __pos Index of character to search back from.
|
|
|
|
* @param __n Number of characters from s to consider.
|
2007-10-01 22:49:39 +02:00
|
|
|
* @return Index of last occurrence.
|
2005-07-06 01:07:18 +02:00
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Starting from @a __pos, searches backward for a character
|
|
|
|
* not contained in the first @a __n characters of @a __s
|
|
|
|
* within this string. If found, returns the index where it
|
|
|
|
* was found. If not found, returns npos.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
find_last_not_of(const _CharT* __s, size_type __pos,
|
|
|
|
size_type __n) const;
|
|
|
|
/**
|
2007-10-01 22:49:39 +02:00
|
|
|
* @brief Find last position of a character not in C string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __s C string containing characters to avoid.
|
|
|
|
* @param __pos Index of character to search back from (default end).
|
2007-10-01 22:49:39 +02:00
|
|
|
* @return Index of last occurrence.
|
2005-07-06 01:07:18 +02:00
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Starting from @a __pos, searches backward for a character
|
|
|
|
* not contained in @a __s within this string. If found,
|
|
|
|
* returns the index where it was found. If not found, returns
|
|
|
|
* npos.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
find_last_not_of(const _CharT* __s, size_type __pos = npos) const
|
|
|
|
{
|
|
|
|
__glibcxx_requires_string(__s);
|
|
|
|
return this->find_last_not_of(__s, __pos, traits_type::length(__s));
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find last position of a different character.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __c Character to avoid.
|
|
|
|
* @param __pos Index of character to search back from (default end).
|
2007-10-01 22:49:39 +02:00
|
|
|
* @return Index of last occurrence.
|
2005-07-06 01:07:18 +02:00
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Starting from @a __pos, searches backward for a character
|
|
|
|
* other than @a __c within this string. If found, returns the
|
|
|
|
* index where it was found. If not found, returns npos.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
size_type
|
2011-05-31 14:50:31 +02:00
|
|
|
find_last_not_of(_CharT __c, size_type __pos = npos) const
|
|
|
|
_GLIBCXX_NOEXCEPT;
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Get a substring.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __pos Index of first character (default 0).
|
|
|
|
* @param __n Number of characters in substring (default remainder).
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return The new string.
|
|
|
|
* @throw std::out_of_range If pos > size().
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Construct and return a new string using the @a __n
|
|
|
|
* characters starting at @a __pos. If the string is too
|
|
|
|
* short, use the remainder of the characters. If @a __pos is
|
|
|
|
* beyond the end of the string, out_of_range is thrown.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
__versa_string
|
|
|
|
substr(size_type __pos = 0, size_type __n = npos) const
|
|
|
|
{
|
|
|
|
return __versa_string(*this, _M_check(__pos, "__versa_string::substr"),
|
|
|
|
__n);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Compare to a string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __str String to compare against.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Integer < 0, 0, or > 0.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Returns an integer < 0 if this string is ordered before @a
|
|
|
|
* __str, 0 if their values are equivalent, or > 0 if this
|
|
|
|
* string is ordered after @a __str. Determines the effective
|
|
|
|
* length rlen of the strings to compare as the smallest of
|
|
|
|
* size() and str.size(). The function then compares the two
|
|
|
|
* strings by calling traits::compare(data(), str.data(),rlen).
|
|
|
|
* If the result of the comparison is nonzero returns it,
|
|
|
|
* otherwise the shorter one is ordered first.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
int
|
|
|
|
compare(const __versa_string& __str) const
|
|
|
|
{
|
2005-12-11 01:41:29 +01:00
|
|
|
if (this->_M_compare(__str))
|
|
|
|
return 0;
|
|
|
|
|
2005-07-06 01:07:18 +02:00
|
|
|
const size_type __size = this->size();
|
|
|
|
const size_type __osize = __str.size();
|
|
|
|
const size_type __len = std::min(__size, __osize);
|
|
|
|
|
|
|
|
int __r = traits_type::compare(this->_M_data(), __str.data(), __len);
|
|
|
|
if (!__r)
|
2011-05-02 18:25:14 +02:00
|
|
|
__r = this->_S_compare(__size, __osize);
|
2005-07-06 01:07:18 +02:00
|
|
|
return __r;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Compare substring to a string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __pos Index of first character of substring.
|
|
|
|
* @param __n Number of characters in substring.
|
|
|
|
* @param __str String to compare against.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Integer < 0, 0, or > 0.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Form the substring of this string from the @a __n characters
|
|
|
|
* starting at @a __pos. Returns an integer < 0 if the
|
|
|
|
* substring is ordered before @a __str, 0 if their values are
|
|
|
|
* equivalent, or > 0 if the substring is ordered after @a
|
|
|
|
* __str. Determines the effective length rlen of the strings
|
|
|
|
* to compare as the smallest of the length of the substring
|
|
|
|
* and @a __str.size(). The function then compares the two
|
|
|
|
* strings by calling
|
|
|
|
* traits::compare(substring.data(),str.data(),rlen). If the
|
|
|
|
* result of the comparison is nonzero returns it, otherwise
|
|
|
|
* the shorter one is ordered first.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
int
|
|
|
|
compare(size_type __pos, size_type __n,
|
|
|
|
const __versa_string& __str) const;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Compare substring to a substring.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __pos1 Index of first character of substring.
|
|
|
|
* @param __n1 Number of characters in substring.
|
|
|
|
* @param __str String to compare against.
|
|
|
|
* @param __pos2 Index of first character of substring of str.
|
|
|
|
* @param __n2 Number of characters in substring of str.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Integer < 0, 0, or > 0.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Form the substring of this string from the @a __n1
|
|
|
|
* characters starting at @a __pos1. Form the substring of @a
|
|
|
|
* __str from the @a __n2 characters starting at @a __pos2.
|
|
|
|
* Returns an integer < 0 if this substring is ordered before
|
|
|
|
* the substring of @a __str, 0 if their values are equivalent,
|
|
|
|
* or > 0 if this substring is ordered after the substring of
|
|
|
|
* @a __str. Determines the effective length rlen of the
|
|
|
|
* strings to compare as the smallest of the lengths of the
|
|
|
|
* substrings. The function then compares the two strings by
|
|
|
|
* calling
|
2005-07-06 01:07:18 +02:00
|
|
|
* traits::compare(substring.data(),str.substr(pos2,n2).data(),rlen).
|
2009-02-21 01:45:21 +01:00
|
|
|
* If the result of the comparison is nonzero returns it,
|
|
|
|
* otherwise the shorter one is ordered first.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
int
|
|
|
|
compare(size_type __pos1, size_type __n1, const __versa_string& __str,
|
|
|
|
size_type __pos2, size_type __n2) const;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Compare to a C string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __s C string to compare against.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Integer < 0, 0, or > 0.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Returns an integer < 0 if this string is ordered before @a
|
|
|
|
* __s, 0 if their values are equivalent, or > 0 if this string
|
|
|
|
* is ordered after @a __s. Determines the effective length
|
|
|
|
* rlen of the strings to compare as the smallest of size() and
|
|
|
|
* the length of a string constructed from @a __s. The
|
|
|
|
* function then compares the two strings by calling
|
|
|
|
* traits::compare(data(),s,rlen). If the result of the
|
|
|
|
* comparison is nonzero returns it, otherwise the shorter one
|
|
|
|
* is ordered first.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
int
|
|
|
|
compare(const _CharT* __s) const;
|
|
|
|
|
|
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
|
|
// 5 String::compare specification questionable
|
|
|
|
/**
|
|
|
|
* @brief Compare substring to a C string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __pos Index of first character of substring.
|
|
|
|
* @param __n1 Number of characters in substring.
|
|
|
|
* @param __s C string to compare against.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Integer < 0, 0, or > 0.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Form the substring of this string from the @a __n1
|
|
|
|
* characters starting at @a __pos. Returns an integer < 0 if
|
|
|
|
* the substring is ordered before @a __s, 0 if their values
|
|
|
|
* are equivalent, or > 0 if the substring is ordered after @a
|
|
|
|
* __s. Determines the effective length rlen of the strings to
|
|
|
|
* compare as the smallest of the length of the substring and
|
|
|
|
* the length of a string constructed from @a __s. The
|
2005-07-06 01:07:18 +02:00
|
|
|
* function then compares the two string by calling
|
2009-02-21 01:45:21 +01:00
|
|
|
* traits::compare(substring.data(),s,rlen). If the result of
|
|
|
|
* the comparison is nonzero returns it, otherwise the shorter
|
|
|
|
* one is ordered first.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
int
|
|
|
|
compare(size_type __pos, size_type __n1, const _CharT* __s) const;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Compare substring against a character array.
|
2011-08-07 09:27:06 +02:00
|
|
|
* @param __pos Index of first character of substring.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __n1 Number of characters in substring.
|
|
|
|
* @param __s character array to compare against.
|
|
|
|
* @param __n2 Number of characters of s.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Integer < 0, 0, or > 0.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Form the substring of this string from the @a __n1
|
2011-08-07 09:27:06 +02:00
|
|
|
* characters starting at @a __pos. Form a string from the
|
2009-02-21 01:45:21 +01:00
|
|
|
* first @a __n2 characters of @a __s. Returns an integer < 0
|
|
|
|
* if this substring is ordered before the string from @a __s,
|
|
|
|
* 0 if their values are equivalent, or > 0 if this substring
|
|
|
|
* is ordered after the string from @a __s. Determines the
|
|
|
|
* effective length rlen of the strings to compare as the
|
|
|
|
* smallest of the length of the substring and @a __n2. The
|
|
|
|
* function then compares the two strings by calling
|
2011-08-07 09:27:06 +02:00
|
|
|
* traits::compare(substring.data(),__s,rlen). If the result of
|
2009-02-21 01:45:21 +01:00
|
|
|
* the comparison is nonzero returns it, otherwise the shorter
|
2005-07-06 01:07:18 +02:00
|
|
|
* one is ordered first.
|
|
|
|
*
|
2011-08-07 09:27:06 +02:00
|
|
|
* NB: __s must have at least n2 characters, <em>\\0</em> has no special
|
2005-07-06 01:07:18 +02:00
|
|
|
* meaning.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
compare(size_type __pos, size_type __n1, const _CharT* __s,
|
|
|
|
size_type __n2) const;
|
|
|
|
};
|
|
|
|
|
|
|
|
// operator+
|
|
|
|
/**
|
|
|
|
* @brief Concatenate two strings.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __lhs First string.
|
|
|
|
* @param __rhs Last string.
|
|
|
|
* @return New string with value of @a __lhs followed by @a __rhs.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
__versa_string<_CharT, _Traits, _Alloc, _Base>
|
|
|
|
operator+(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs);
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Concatenate C string and string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __lhs First string.
|
|
|
|
* @param __rhs Last string.
|
|
|
|
* @return New string with value of @a __lhs followed by @a __rhs.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
__versa_string<_CharT, _Traits, _Alloc, _Base>
|
|
|
|
operator+(const _CharT* __lhs,
|
|
|
|
const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Concatenate character and string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __lhs First string.
|
|
|
|
* @param __rhs Last string.
|
|
|
|
* @return New string with @a __lhs followed by @a __rhs.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
__versa_string<_CharT, _Traits, _Alloc, _Base>
|
|
|
|
operator+(_CharT __lhs,
|
|
|
|
const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Concatenate string and C string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __lhs First string.
|
|
|
|
* @param __rhs Last string.
|
|
|
|
* @return New string with @a __lhs followed by @a __rhs.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
__versa_string<_CharT, _Traits, _Alloc, _Base>
|
2005-07-06 01:07:18 +02:00
|
|
|
operator+(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
const _CharT* __rhs);
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Concatenate string and character.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __lhs First string.
|
|
|
|
* @param __rhs Last string.
|
|
|
|
* @return New string with @a __lhs followed by @a __rhs.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
__versa_string<_CharT, _Traits, _Alloc, _Base>
|
2005-07-06 01:07:18 +02:00
|
|
|
operator+(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
_CharT __rhs);
|
2005-07-06 01:07:18 +02:00
|
|
|
|
2012-11-10 18:27:22 +01:00
|
|
|
#if __cplusplus >= 201103L
|
vstring.h (operator+(__versa_string<>&&, const __versa_string<>&), [...]): Add.
2010-12-15 Paolo Carlini <paolo.carlini@oracle.com>
* include/ext/vstring.h (operator+(__versa_string<>&&,
const __versa_string<>&), operator+(const __versa_string<>&,
__versa_string<>&&), operator+(__versa_string<>&&,
__versa_string<>&&), operator+(const _CharT*,
__versa_string<>&&), operator+(_CharT, __versa_string<>&&),
operator+(__versa_string<>&&, const _CharT*),
operator+(__versa_string<>&&, _CharT)): Add.
* testsuite/ext/vstring/operators/1.cc: New.
From-SVN: r167853
2010-12-15 13:59:05 +01:00
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline __versa_string<_CharT, _Traits, _Alloc, _Base>
|
|
|
|
operator+(__versa_string<_CharT, _Traits, _Alloc, _Base>&& __lhs,
|
|
|
|
const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
|
|
|
|
{ return std::move(__lhs.append(__rhs)); }
|
|
|
|
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline __versa_string<_CharT, _Traits, _Alloc, _Base>
|
|
|
|
operator+(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
|
|
|
|
__versa_string<_CharT, _Traits, _Alloc, _Base>&& __rhs)
|
|
|
|
{ return std::move(__rhs.insert(0, __lhs)); }
|
|
|
|
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline __versa_string<_CharT, _Traits, _Alloc, _Base>
|
|
|
|
operator+(__versa_string<_CharT, _Traits, _Alloc, _Base>&& __lhs,
|
|
|
|
__versa_string<_CharT, _Traits, _Alloc, _Base>&& __rhs)
|
2010-12-19 16:53:44 +01:00
|
|
|
{
|
|
|
|
const auto __size = __lhs.size() + __rhs.size();
|
|
|
|
const bool __cond = (__size > __lhs.capacity()
|
|
|
|
&& __size <= __rhs.capacity());
|
|
|
|
return __cond ? std::move(__rhs.insert(0, __lhs))
|
|
|
|
: std::move(__lhs.append(__rhs));
|
|
|
|
}
|
vstring.h (operator+(__versa_string<>&&, const __versa_string<>&), [...]): Add.
2010-12-15 Paolo Carlini <paolo.carlini@oracle.com>
* include/ext/vstring.h (operator+(__versa_string<>&&,
const __versa_string<>&), operator+(const __versa_string<>&,
__versa_string<>&&), operator+(__versa_string<>&&,
__versa_string<>&&), operator+(const _CharT*,
__versa_string<>&&), operator+(_CharT, __versa_string<>&&),
operator+(__versa_string<>&&, const _CharT*),
operator+(__versa_string<>&&, _CharT)): Add.
* testsuite/ext/vstring/operators/1.cc: New.
From-SVN: r167853
2010-12-15 13:59:05 +01:00
|
|
|
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline __versa_string<_CharT, _Traits, _Alloc, _Base>
|
|
|
|
operator+(const _CharT* __lhs,
|
|
|
|
__versa_string<_CharT, _Traits, _Alloc, _Base>&& __rhs)
|
|
|
|
{ return std::move(__rhs.insert(0, __lhs)); }
|
|
|
|
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline __versa_string<_CharT, _Traits, _Alloc, _Base>
|
|
|
|
operator+(_CharT __lhs,
|
|
|
|
__versa_string<_CharT, _Traits, _Alloc, _Base>&& __rhs)
|
|
|
|
{ return std::move(__rhs.insert(0, 1, __lhs)); }
|
|
|
|
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline __versa_string<_CharT, _Traits, _Alloc, _Base>
|
|
|
|
operator+(__versa_string<_CharT, _Traits, _Alloc, _Base>&& __lhs,
|
|
|
|
const _CharT* __rhs)
|
|
|
|
{ return std::move(__lhs.append(__rhs)); }
|
|
|
|
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline __versa_string<_CharT, _Traits, _Alloc, _Base>
|
|
|
|
operator+(__versa_string<_CharT, _Traits, _Alloc, _Base>&& __lhs,
|
|
|
|
_CharT __rhs)
|
|
|
|
{ return std::move(__lhs.append(1, __rhs)); }
|
|
|
|
#endif
|
|
|
|
|
2005-07-06 01:07:18 +02:00
|
|
|
// operator ==
|
|
|
|
/**
|
|
|
|
* @brief Test equivalence of two strings.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __lhs First string.
|
|
|
|
* @param __rhs Second string.
|
|
|
|
* @return True if @a __lhs.compare(@a __rhs) == 0. False otherwise.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline bool
|
|
|
|
operator==(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
|
|
|
|
const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
|
|
|
|
{ return __lhs.compare(__rhs) == 0; }
|
|
|
|
|
2007-07-27 19:25:04 +02:00
|
|
|
template<typename _CharT,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline typename __enable_if<std::__is_char<_CharT>::__value, bool>::__type
|
|
|
|
operator==(const __versa_string<_CharT, std::char_traits<_CharT>,
|
|
|
|
std::allocator<_CharT>, _Base>& __lhs,
|
|
|
|
const __versa_string<_CharT, std::char_traits<_CharT>,
|
|
|
|
std::allocator<_CharT>, _Base>& __rhs)
|
|
|
|
{ return (__lhs.size() == __rhs.size()
|
|
|
|
&& !std::char_traits<_CharT>::compare(__lhs.data(), __rhs.data(),
|
|
|
|
__lhs.size())); }
|
|
|
|
|
2005-07-06 01:07:18 +02:00
|
|
|
/**
|
|
|
|
* @brief Test equivalence of C string and string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __lhs C string.
|
|
|
|
* @param __rhs String.
|
|
|
|
* @return True if @a __rhs.compare(@a __lhs) == 0. False otherwise.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline bool
|
|
|
|
operator==(const _CharT* __lhs,
|
|
|
|
const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
|
|
|
|
{ return __rhs.compare(__lhs) == 0; }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Test equivalence of string and C string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __lhs String.
|
|
|
|
* @param __rhs C string.
|
|
|
|
* @return True if @a __lhs.compare(@a __rhs) == 0. False otherwise.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline bool
|
|
|
|
operator==(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
|
|
|
|
const _CharT* __rhs)
|
|
|
|
{ return __lhs.compare(__rhs) == 0; }
|
|
|
|
|
|
|
|
// operator !=
|
|
|
|
/**
|
|
|
|
* @brief Test difference of two strings.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __lhs First string.
|
|
|
|
* @param __rhs Second string.
|
|
|
|
* @return True if @a __lhs.compare(@a __rhs) != 0. False otherwise.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline bool
|
|
|
|
operator!=(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
|
|
|
|
const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
|
2007-07-27 19:25:04 +02:00
|
|
|
{ return !(__lhs == __rhs); }
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Test difference of C string and string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __lhs C string.
|
|
|
|
* @param __rhs String.
|
|
|
|
* @return True if @a __rhs.compare(@a __lhs) != 0. False otherwise.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline bool
|
|
|
|
operator!=(const _CharT* __lhs,
|
|
|
|
const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
|
2007-07-27 19:25:04 +02:00
|
|
|
{ return !(__lhs == __rhs); }
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Test difference of string and C string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __lhs String.
|
|
|
|
* @param __rhs C string.
|
|
|
|
* @return True if @a __lhs.compare(@a __rhs) != 0. False otherwise.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline bool
|
|
|
|
operator!=(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
|
|
|
|
const _CharT* __rhs)
|
2007-07-27 19:25:04 +02:00
|
|
|
{ return !(__lhs == __rhs); }
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
// operator <
|
|
|
|
/**
|
|
|
|
* @brief Test if string precedes string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __lhs First string.
|
|
|
|
* @param __rhs Second string.
|
|
|
|
* @return True if @a __lhs precedes @a __rhs. False otherwise.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline bool
|
|
|
|
operator<(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
|
|
|
|
const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
|
|
|
|
{ return __lhs.compare(__rhs) < 0; }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Test if string precedes C string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __lhs String.
|
|
|
|
* @param __rhs C string.
|
|
|
|
* @return True if @a __lhs precedes @a __rhs. False otherwise.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline bool
|
|
|
|
operator<(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
|
|
|
|
const _CharT* __rhs)
|
|
|
|
{ return __lhs.compare(__rhs) < 0; }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Test if C string precedes string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __lhs C string.
|
|
|
|
* @param __rhs String.
|
|
|
|
* @return True if @a __lhs precedes @a __rhs. False otherwise.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline bool
|
|
|
|
operator<(const _CharT* __lhs,
|
|
|
|
const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
|
|
|
|
{ return __rhs.compare(__lhs) > 0; }
|
|
|
|
|
|
|
|
// operator >
|
|
|
|
/**
|
|
|
|
* @brief Test if string follows string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __lhs First string.
|
|
|
|
* @param __rhs Second string.
|
|
|
|
* @return True if @a __lhs follows @a __rhs. False otherwise.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline bool
|
|
|
|
operator>(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
|
|
|
|
const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
|
|
|
|
{ return __lhs.compare(__rhs) > 0; }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Test if string follows C string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __lhs String.
|
|
|
|
* @param __rhs C string.
|
|
|
|
* @return True if @a __lhs follows @a __rhs. False otherwise.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline bool
|
|
|
|
operator>(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
|
|
|
|
const _CharT* __rhs)
|
|
|
|
{ return __lhs.compare(__rhs) > 0; }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Test if C string follows string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __lhs C string.
|
|
|
|
* @param __rhs String.
|
|
|
|
* @return True if @a __lhs follows @a __rhs. False otherwise.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline bool
|
|
|
|
operator>(const _CharT* __lhs,
|
|
|
|
const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
|
|
|
|
{ return __rhs.compare(__lhs) < 0; }
|
|
|
|
|
|
|
|
// operator <=
|
|
|
|
/**
|
|
|
|
* @brief Test if string doesn't follow string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __lhs First string.
|
|
|
|
* @param __rhs Second string.
|
|
|
|
* @return True if @a __lhs doesn't follow @a __rhs. False otherwise.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline bool
|
|
|
|
operator<=(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
|
|
|
|
const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
|
|
|
|
{ return __lhs.compare(__rhs) <= 0; }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Test if string doesn't follow C string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __lhs String.
|
|
|
|
* @param __rhs C string.
|
|
|
|
* @return True if @a __lhs doesn't follow @a __rhs. False otherwise.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline bool
|
|
|
|
operator<=(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
|
|
|
|
const _CharT* __rhs)
|
|
|
|
{ return __lhs.compare(__rhs) <= 0; }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Test if C string doesn't follow string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __lhs C string.
|
|
|
|
* @param __rhs String.
|
|
|
|
* @return True if @a __lhs doesn't follow @a __rhs. False otherwise.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline bool
|
|
|
|
operator<=(const _CharT* __lhs,
|
|
|
|
const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
|
|
|
|
{ return __rhs.compare(__lhs) >= 0; }
|
|
|
|
|
|
|
|
// operator >=
|
|
|
|
/**
|
|
|
|
* @brief Test if string doesn't precede string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __lhs First string.
|
|
|
|
* @param __rhs Second string.
|
|
|
|
* @return True if @a __lhs doesn't precede @a __rhs. False otherwise.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline bool
|
|
|
|
operator>=(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
|
|
|
|
const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
|
|
|
|
{ return __lhs.compare(__rhs) >= 0; }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Test if string doesn't precede C string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __lhs String.
|
|
|
|
* @param __rhs C string.
|
|
|
|
* @return True if @a __lhs doesn't precede @a __rhs. False otherwise.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline bool
|
|
|
|
operator>=(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
|
|
|
|
const _CharT* __rhs)
|
|
|
|
{ return __lhs.compare(__rhs) >= 0; }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Test if C string doesn't precede string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __lhs C string.
|
|
|
|
* @param __rhs String.
|
|
|
|
* @return True if @a __lhs doesn't precede @a __rhs. False otherwise.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline bool
|
|
|
|
operator>=(const _CharT* __lhs,
|
|
|
|
const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
|
|
|
|
{ return __rhs.compare(__lhs) <= 0; }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Swap contents of two strings.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __lhs First string.
|
|
|
|
* @param __rhs Second string.
|
2005-07-06 01:07:18 +02:00
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Exchanges the contents of @a __lhs and @a __rhs in constant time.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline void
|
|
|
|
swap(__versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
|
|
|
|
__versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
|
|
|
|
{ __lhs.swap(__rhs); }
|
|
|
|
|
PR libstdc++/36104 part four
2011-01-30 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/36104 part four
* include/bits/c++config (_GLIBCXX_STD): Remove.
(_GLIBCXX_STD_D, _GLIBCXX_PR): Now _GLIBCXX_STD_C.
(_GLIBCXX_P): Now _GLIBCXX_STD_A.
(_GLIBCXX_NAMESPACE_DEBUG, _GLIBCXX_NAMESPACE_PARALLEL,
_GLIBCXX_NAMESPACE_PROFILE, _GLIBCXX_NAMESPACE_VERSION): Remove.
(_GLIBCXX_INLINE_DEBUG, _GLIBCXX_INLINE_PARALLEL,
_GLIBCXX_INLINE_PROFILE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE(X)): Remove.
(_GLIBCXX_END_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NESTED_NAMESPACE(X, Y)): Remove.
(_GLIBCXX_END_NESTED_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE_ALGO): Add.
(_GLIBCXX_END_NAMESPACE_ALGO): Add.
(_GLIBCXX_BEGIN_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_END_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_BEGIN_NAMESPACE_VERSION): Add.
(_GLIBCXX_END_NAMESPACE_VERSION): Add.
(_GLIBCXX_BEGIN_LDBL_NAMESPACE): To _GLIBCXX_BEGIN_NAMESPACE_LDBL.
(_GLIBCXX_END_LDBL_NAMESPACE): To _GLIBCXX_END_NAMESPACE_LDBL.
(_GLIBCXX_VISIBILITY_ATTR): Revert to _GLIBCXX_VISIBILITY.
* include/*: Use new macros for namespace scope.
* config/*: Same.
* src/*: Same.
* src/Makefile.am (sources): Remove debug_list.cc, add
compatibility-debug_list-2.cc.
(parallel_sources): Remove parallel_list.cc, add
compatibility-parallel_list-2.cc.
(compatibility-parallel_list-2.[o,lo]): New rule.
* src/Makefile.in: Regenerate.
* src/debug_list.cc: Remove.
* src/parallel_list.cc: Remove.
* src/compatibility-list-2.cc: New.
* src/compatibility-debug_list-2.cc: New.
* src/compatibility-parallel_list-2.cc: New.
* doc/doxygen/user.cfg.in: Adjust macros.
* testsuite/20_util/auto_ptr/assign_neg.cc: Adjust line numbers, macros.
* testsuite/20_util/declval/requirements/1_neg.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg1.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg2.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg3.cc: Same.
* testsuite/20_util/forward/c_neg.cc: Same.
* testsuite/20_util/forward/f_neg.cc: Same.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Same.
* testsuite/20_util/ratio/operations/ops_overflow_neg.cc: Same.
* testsuite/20_util/shared_ptr/cons/43820_neg.cc: Same.
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/forward_list/capacity/1.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
assign_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
insert_neg.cc: Same.
* testsuite/23_containers/list/capacity/29134.cc: Same.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/vector/bool/capacity/29134.cc: Same.
* testsuite/23_containers/vector/bool/modifiers/insert/31370.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: Same.
* testsuite/25_algorithms/sort/35588.cc: Same.
* testsuite/27_io/ios_base/cons/assign_neg.cc: Same.
* testsuite/27_io/ios_base/cons/copy_neg.cc: Same.
* testsuite/ext/profile/mutex_extensions_neg.cc: Same.
* testsuite/ext/profile/profiler_algos.cc: Same.
* testsuite/ext/type_traits/add_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/add_unsigned_integer_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_integer_neg.cc: Same.
* testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc: Same.
From-SVN: r169421
2011-01-30 23:39:36 +01:00
|
|
|
_GLIBCXX_END_NAMESPACE_VERSION
|
|
|
|
} // namespace
|
2005-12-19 01:56:05 +01:00
|
|
|
|
PR libstdc++/36104 part four
2011-01-30 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/36104 part four
* include/bits/c++config (_GLIBCXX_STD): Remove.
(_GLIBCXX_STD_D, _GLIBCXX_PR): Now _GLIBCXX_STD_C.
(_GLIBCXX_P): Now _GLIBCXX_STD_A.
(_GLIBCXX_NAMESPACE_DEBUG, _GLIBCXX_NAMESPACE_PARALLEL,
_GLIBCXX_NAMESPACE_PROFILE, _GLIBCXX_NAMESPACE_VERSION): Remove.
(_GLIBCXX_INLINE_DEBUG, _GLIBCXX_INLINE_PARALLEL,
_GLIBCXX_INLINE_PROFILE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE(X)): Remove.
(_GLIBCXX_END_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NESTED_NAMESPACE(X, Y)): Remove.
(_GLIBCXX_END_NESTED_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE_ALGO): Add.
(_GLIBCXX_END_NAMESPACE_ALGO): Add.
(_GLIBCXX_BEGIN_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_END_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_BEGIN_NAMESPACE_VERSION): Add.
(_GLIBCXX_END_NAMESPACE_VERSION): Add.
(_GLIBCXX_BEGIN_LDBL_NAMESPACE): To _GLIBCXX_BEGIN_NAMESPACE_LDBL.
(_GLIBCXX_END_LDBL_NAMESPACE): To _GLIBCXX_END_NAMESPACE_LDBL.
(_GLIBCXX_VISIBILITY_ATTR): Revert to _GLIBCXX_VISIBILITY.
* include/*: Use new macros for namespace scope.
* config/*: Same.
* src/*: Same.
* src/Makefile.am (sources): Remove debug_list.cc, add
compatibility-debug_list-2.cc.
(parallel_sources): Remove parallel_list.cc, add
compatibility-parallel_list-2.cc.
(compatibility-parallel_list-2.[o,lo]): New rule.
* src/Makefile.in: Regenerate.
* src/debug_list.cc: Remove.
* src/parallel_list.cc: Remove.
* src/compatibility-list-2.cc: New.
* src/compatibility-debug_list-2.cc: New.
* src/compatibility-parallel_list-2.cc: New.
* doc/doxygen/user.cfg.in: Adjust macros.
* testsuite/20_util/auto_ptr/assign_neg.cc: Adjust line numbers, macros.
* testsuite/20_util/declval/requirements/1_neg.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg1.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg2.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg3.cc: Same.
* testsuite/20_util/forward/c_neg.cc: Same.
* testsuite/20_util/forward/f_neg.cc: Same.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Same.
* testsuite/20_util/ratio/operations/ops_overflow_neg.cc: Same.
* testsuite/20_util/shared_ptr/cons/43820_neg.cc: Same.
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/forward_list/capacity/1.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
assign_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
insert_neg.cc: Same.
* testsuite/23_containers/list/capacity/29134.cc: Same.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/vector/bool/capacity/29134.cc: Same.
* testsuite/23_containers/vector/bool/modifiers/insert/31370.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: Same.
* testsuite/25_algorithms/sort/35588.cc: Same.
* testsuite/27_io/ios_base/cons/assign_neg.cc: Same.
* testsuite/27_io/ios_base/cons/copy_neg.cc: Same.
* testsuite/ext/profile/mutex_extensions_neg.cc: Same.
* testsuite/ext/profile/profiler_algos.cc: Same.
* testsuite/ext/type_traits/add_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/add_unsigned_integer_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_integer_neg.cc: Same.
* testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc: Same.
From-SVN: r169421
2011-01-30 23:39:36 +01:00
|
|
|
namespace std _GLIBCXX_VISIBILITY(default)
|
|
|
|
{
|
|
|
|
_GLIBCXX_BEGIN_NAMESPACE_VERSION
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Read stream into a string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __is Input stream.
|
|
|
|
* @param __str Buffer to store into.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Reference to the input stream.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Stores characters from @a __is into @a __str until whitespace is
|
|
|
|
* found, the end of the stream is encountered, or str.max_size()
|
|
|
|
* is reached. If is.width() is non-zero, that is the limit on the
|
|
|
|
* number of characters stored into @a __str. Any previous
|
|
|
|
* contents of @a __str are erased.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
basic_istream<_CharT, _Traits>&
|
|
|
|
operator>>(basic_istream<_CharT, _Traits>& __is,
|
|
|
|
__gnu_cxx::__versa_string<_CharT, _Traits,
|
|
|
|
_Alloc, _Base>& __str);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Write string to a stream.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __os Output stream.
|
|
|
|
* @param __str String to write out.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Reference to the output stream.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Output characters of @a __str into os following the same rules as for
|
2005-07-06 01:07:18 +02:00
|
|
|
* writing a C string.
|
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
PR libstdc++/28277 (partial: vstring bits)
2007-04-10 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/28277 (partial: vstring bits)
* include/bits/ostream_insert.h: New.
* include/Makefile.am: Add.
* include/ext/vstring.h (operator<<(basic_ostream<>&,
const __versa_string<>&): Forward to __ostream_insert.
* include/bits/basic_string.h (operator<<(basic_ostream<>&,
const string<>&)): Likewise.
* include/std/ostream (operator<<(basic_ostream<>&, _CharT),
operator<<(basic_ostream<char,>&, char), operator<<(basic_ostream<>&,
const _CharT*), operator<<(basic_ostream<char,>&, const char*)):
Likewise.
* include/ext/vstring.tcc (operator<<(basic_ostream<>&,
const __versa_string<>&)): Remove.
(class basic_ostream): Remove friend declarations.
(basic_ostream<>::_M_write(char_type, streamsize),
_M_insert(const char_type*, streamsize)): Remove.
* include/bits/ostream.tcc (_M_insert(const char_type*, streamsize)):
Remove definition.
(operator<<(basic_ostream<>&, const char*)): Use __ostream_insert.
* config/abi/pre/gnu.ver: Adjust.
* src/ostream-inst.cc: Add __ostream_insert instantiations.
* include/bits/locale_facets.h (__pad<>::_S_pad): Remove __num
parameter.
* include/bits/locale_facets.tcc (__pad<>::_S_pad): Adjust.
(num_put<>::_M_pad(_CharT, streamsize, ios_base&, _CharT*,
const _CharT*, int&)): Likewise.
* include/Makefile.in: Rebuild.
* testsuite/ext/vstring/inserters_extractors/char/28277.cc: New.
* testsuite/ext/vstring/inserters_extractors/wchar_t/28277.cc: New.
* include/ext/vstring_util.h: Do not include the whole <locale>.
* include/ext/vstring.tcc (operator>>(basic_istream<>&,
__versa_string<>&, getline(basic_istream<>&, __versa_string<>&,
_CharT)): Tweak to refer to ios_base as a base of istream; do not
refer to non-standard types of istream.
* include/bits/istream.tcc (operator>>(basic_istream<>&, _CharT*),
ws(basic_istream<>&)): Do not refer to non-standard types of istream.
* include/std/bitset (operator>>(std::basic_istream<>&, bitset<>&)):
Avoid using basic_streambuf<>*.
* include/bits/istream.tcc (operator>>(basic_istream<>&,
basic_string<>&), getline(basic_istream<>&, basic_string<>&, _CharT)):
Move...
* include/bits/basic_string.tcc: ... here; tweak to refer to ios_base
as a base of istream; do not refer to non-standard types of istream.
* include/std/string: Tweak includes.
* include/ext/type_traits.h (__is_null_pointer): Add.
* include/ext/rc_string_base.h: Use it.
* include/ext/sso_string_base.h: Likewise.
* include/bits/basic_string.tcc (__is_null_pointer): Remove, use
the above.
* include/ext/vstring_util.h (__vstring_utility<>::_S_is_null_pointer):
Remove.
From-SVN: r123692
2007-04-10 12:38:50 +02:00
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline basic_ostream<_CharT, _Traits>&
|
2005-07-06 01:07:18 +02:00
|
|
|
operator<<(basic_ostream<_CharT, _Traits>& __os,
|
PR libstdc++/28277 (partial: vstring bits)
2007-04-10 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/28277 (partial: vstring bits)
* include/bits/ostream_insert.h: New.
* include/Makefile.am: Add.
* include/ext/vstring.h (operator<<(basic_ostream<>&,
const __versa_string<>&): Forward to __ostream_insert.
* include/bits/basic_string.h (operator<<(basic_ostream<>&,
const string<>&)): Likewise.
* include/std/ostream (operator<<(basic_ostream<>&, _CharT),
operator<<(basic_ostream<char,>&, char), operator<<(basic_ostream<>&,
const _CharT*), operator<<(basic_ostream<char,>&, const char*)):
Likewise.
* include/ext/vstring.tcc (operator<<(basic_ostream<>&,
const __versa_string<>&)): Remove.
(class basic_ostream): Remove friend declarations.
(basic_ostream<>::_M_write(char_type, streamsize),
_M_insert(const char_type*, streamsize)): Remove.
* include/bits/ostream.tcc (_M_insert(const char_type*, streamsize)):
Remove definition.
(operator<<(basic_ostream<>&, const char*)): Use __ostream_insert.
* config/abi/pre/gnu.ver: Adjust.
* src/ostream-inst.cc: Add __ostream_insert instantiations.
* include/bits/locale_facets.h (__pad<>::_S_pad): Remove __num
parameter.
* include/bits/locale_facets.tcc (__pad<>::_S_pad): Adjust.
(num_put<>::_M_pad(_CharT, streamsize, ios_base&, _CharT*,
const _CharT*, int&)): Likewise.
* include/Makefile.in: Rebuild.
* testsuite/ext/vstring/inserters_extractors/char/28277.cc: New.
* testsuite/ext/vstring/inserters_extractors/wchar_t/28277.cc: New.
* include/ext/vstring_util.h: Do not include the whole <locale>.
* include/ext/vstring.tcc (operator>>(basic_istream<>&,
__versa_string<>&, getline(basic_istream<>&, __versa_string<>&,
_CharT)): Tweak to refer to ios_base as a base of istream; do not
refer to non-standard types of istream.
* include/bits/istream.tcc (operator>>(basic_istream<>&, _CharT*),
ws(basic_istream<>&)): Do not refer to non-standard types of istream.
* include/std/bitset (operator>>(std::basic_istream<>&, bitset<>&)):
Avoid using basic_streambuf<>*.
* include/bits/istream.tcc (operator>>(basic_istream<>&,
basic_string<>&), getline(basic_istream<>&, basic_string<>&, _CharT)):
Move...
* include/bits/basic_string.tcc: ... here; tweak to refer to ios_base
as a base of istream; do not refer to non-standard types of istream.
* include/std/string: Tweak includes.
* include/ext/type_traits.h (__is_null_pointer): Add.
* include/ext/rc_string_base.h: Use it.
* include/ext/sso_string_base.h: Likewise.
* include/bits/basic_string.tcc (__is_null_pointer): Remove, use
the above.
* include/ext/vstring_util.h (__vstring_utility<>::_S_is_null_pointer):
Remove.
From-SVN: r123692
2007-04-10 12:38:50 +02:00
|
|
|
const __gnu_cxx::__versa_string<_CharT, _Traits, _Alloc,
|
|
|
|
_Base>& __str)
|
|
|
|
{
|
|
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
|
|
// 586. string inserter not a formatted function
|
|
|
|
return __ostream_insert(__os, __str.data(), __str.size());
|
|
|
|
}
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Read a line from stream into a string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __is Input stream.
|
|
|
|
* @param __str Buffer to store into.
|
|
|
|
* @param __delim Character marking end of line.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Reference to the input stream.
|
|
|
|
*
|
2009-02-21 01:45:21 +01:00
|
|
|
* Stores characters from @a __is into @a __str until @a __delim is
|
|
|
|
* found, the end of the stream is encountered, or str.max_size()
|
|
|
|
* is reached. If is.width() is non-zero, that is the limit on the
|
|
|
|
* number of characters stored into @a __str. Any previous
|
|
|
|
* contents of @a __str are erased. If @a delim was encountered,
|
|
|
|
* it is extracted but not stored into @a __str.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
basic_istream<_CharT, _Traits>&
|
|
|
|
getline(basic_istream<_CharT, _Traits>& __is,
|
|
|
|
__gnu_cxx::__versa_string<_CharT, _Traits, _Alloc, _Base>& __str,
|
|
|
|
_CharT __delim);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Read a line from stream into a string.
|
2009-02-21 01:45:21 +01:00
|
|
|
* @param __is Input stream.
|
|
|
|
* @param __str Buffer to store into.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Reference to the input stream.
|
|
|
|
*
|
2010-02-04 19:20:34 +01:00
|
|
|
* Stores characters from is into @a __str until '\n' is
|
|
|
|
* found, the end of the stream is encountered, or str.max_size()
|
|
|
|
* is reached. If is.width() is non-zero, that is the limit on the
|
|
|
|
* number of characters stored into @a __str. Any previous
|
|
|
|
* contents of @a __str are erased. If end of line was
|
|
|
|
* encountered, it is extracted but not stored into @a __str.
|
2005-07-06 01:07:18 +02:00
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline basic_istream<_CharT, _Traits>&
|
|
|
|
getline(basic_istream<_CharT, _Traits>& __is,
|
|
|
|
__gnu_cxx::__versa_string<_CharT, _Traits, _Alloc, _Base>& __str)
|
|
|
|
{ return getline(__is, __str, __is.widen('\n')); }
|
|
|
|
|
PR libstdc++/36104 part four
2011-01-30 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/36104 part four
* include/bits/c++config (_GLIBCXX_STD): Remove.
(_GLIBCXX_STD_D, _GLIBCXX_PR): Now _GLIBCXX_STD_C.
(_GLIBCXX_P): Now _GLIBCXX_STD_A.
(_GLIBCXX_NAMESPACE_DEBUG, _GLIBCXX_NAMESPACE_PARALLEL,
_GLIBCXX_NAMESPACE_PROFILE, _GLIBCXX_NAMESPACE_VERSION): Remove.
(_GLIBCXX_INLINE_DEBUG, _GLIBCXX_INLINE_PARALLEL,
_GLIBCXX_INLINE_PROFILE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE(X)): Remove.
(_GLIBCXX_END_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NESTED_NAMESPACE(X, Y)): Remove.
(_GLIBCXX_END_NESTED_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE_ALGO): Add.
(_GLIBCXX_END_NAMESPACE_ALGO): Add.
(_GLIBCXX_BEGIN_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_END_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_BEGIN_NAMESPACE_VERSION): Add.
(_GLIBCXX_END_NAMESPACE_VERSION): Add.
(_GLIBCXX_BEGIN_LDBL_NAMESPACE): To _GLIBCXX_BEGIN_NAMESPACE_LDBL.
(_GLIBCXX_END_LDBL_NAMESPACE): To _GLIBCXX_END_NAMESPACE_LDBL.
(_GLIBCXX_VISIBILITY_ATTR): Revert to _GLIBCXX_VISIBILITY.
* include/*: Use new macros for namespace scope.
* config/*: Same.
* src/*: Same.
* src/Makefile.am (sources): Remove debug_list.cc, add
compatibility-debug_list-2.cc.
(parallel_sources): Remove parallel_list.cc, add
compatibility-parallel_list-2.cc.
(compatibility-parallel_list-2.[o,lo]): New rule.
* src/Makefile.in: Regenerate.
* src/debug_list.cc: Remove.
* src/parallel_list.cc: Remove.
* src/compatibility-list-2.cc: New.
* src/compatibility-debug_list-2.cc: New.
* src/compatibility-parallel_list-2.cc: New.
* doc/doxygen/user.cfg.in: Adjust macros.
* testsuite/20_util/auto_ptr/assign_neg.cc: Adjust line numbers, macros.
* testsuite/20_util/declval/requirements/1_neg.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg1.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg2.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg3.cc: Same.
* testsuite/20_util/forward/c_neg.cc: Same.
* testsuite/20_util/forward/f_neg.cc: Same.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Same.
* testsuite/20_util/ratio/operations/ops_overflow_neg.cc: Same.
* testsuite/20_util/shared_ptr/cons/43820_neg.cc: Same.
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/forward_list/capacity/1.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
assign_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
insert_neg.cc: Same.
* testsuite/23_containers/list/capacity/29134.cc: Same.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/vector/bool/capacity/29134.cc: Same.
* testsuite/23_containers/vector/bool/modifiers/insert/31370.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: Same.
* testsuite/25_algorithms/sort/35588.cc: Same.
* testsuite/27_io/ios_base/cons/assign_neg.cc: Same.
* testsuite/27_io/ios_base/cons/copy_neg.cc: Same.
* testsuite/ext/profile/mutex_extensions_neg.cc: Same.
* testsuite/ext/profile/profiler_algos.cc: Same.
* testsuite/ext/type_traits/add_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/add_unsigned_integer_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_integer_neg.cc: Same.
* testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc: Same.
From-SVN: r169421
2011-01-30 23:39:36 +01:00
|
|
|
_GLIBCXX_END_NAMESPACE_VERSION
|
|
|
|
} // namespace
|
2005-07-06 01:07:18 +02:00
|
|
|
|
2012-11-10 18:27:22 +01:00
|
|
|
#if ((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99))
|
2008-06-29 17:46:50 +02:00
|
|
|
|
|
|
|
#include <ext/string_conversions.h>
|
|
|
|
|
PR libstdc++/36104 part four
2011-01-30 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/36104 part four
* include/bits/c++config (_GLIBCXX_STD): Remove.
(_GLIBCXX_STD_D, _GLIBCXX_PR): Now _GLIBCXX_STD_C.
(_GLIBCXX_P): Now _GLIBCXX_STD_A.
(_GLIBCXX_NAMESPACE_DEBUG, _GLIBCXX_NAMESPACE_PARALLEL,
_GLIBCXX_NAMESPACE_PROFILE, _GLIBCXX_NAMESPACE_VERSION): Remove.
(_GLIBCXX_INLINE_DEBUG, _GLIBCXX_INLINE_PARALLEL,
_GLIBCXX_INLINE_PROFILE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE(X)): Remove.
(_GLIBCXX_END_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NESTED_NAMESPACE(X, Y)): Remove.
(_GLIBCXX_END_NESTED_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE_ALGO): Add.
(_GLIBCXX_END_NAMESPACE_ALGO): Add.
(_GLIBCXX_BEGIN_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_END_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_BEGIN_NAMESPACE_VERSION): Add.
(_GLIBCXX_END_NAMESPACE_VERSION): Add.
(_GLIBCXX_BEGIN_LDBL_NAMESPACE): To _GLIBCXX_BEGIN_NAMESPACE_LDBL.
(_GLIBCXX_END_LDBL_NAMESPACE): To _GLIBCXX_END_NAMESPACE_LDBL.
(_GLIBCXX_VISIBILITY_ATTR): Revert to _GLIBCXX_VISIBILITY.
* include/*: Use new macros for namespace scope.
* config/*: Same.
* src/*: Same.
* src/Makefile.am (sources): Remove debug_list.cc, add
compatibility-debug_list-2.cc.
(parallel_sources): Remove parallel_list.cc, add
compatibility-parallel_list-2.cc.
(compatibility-parallel_list-2.[o,lo]): New rule.
* src/Makefile.in: Regenerate.
* src/debug_list.cc: Remove.
* src/parallel_list.cc: Remove.
* src/compatibility-list-2.cc: New.
* src/compatibility-debug_list-2.cc: New.
* src/compatibility-parallel_list-2.cc: New.
* doc/doxygen/user.cfg.in: Adjust macros.
* testsuite/20_util/auto_ptr/assign_neg.cc: Adjust line numbers, macros.
* testsuite/20_util/declval/requirements/1_neg.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg1.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg2.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg3.cc: Same.
* testsuite/20_util/forward/c_neg.cc: Same.
* testsuite/20_util/forward/f_neg.cc: Same.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Same.
* testsuite/20_util/ratio/operations/ops_overflow_neg.cc: Same.
* testsuite/20_util/shared_ptr/cons/43820_neg.cc: Same.
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/forward_list/capacity/1.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
assign_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
insert_neg.cc: Same.
* testsuite/23_containers/list/capacity/29134.cc: Same.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/vector/bool/capacity/29134.cc: Same.
* testsuite/23_containers/vector/bool/modifiers/insert/31370.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: Same.
* testsuite/25_algorithms/sort/35588.cc: Same.
* testsuite/27_io/ios_base/cons/assign_neg.cc: Same.
* testsuite/27_io/ios_base/cons/copy_neg.cc: Same.
* testsuite/ext/profile/mutex_extensions_neg.cc: Same.
* testsuite/ext/profile/profiler_algos.cc: Same.
* testsuite/ext/type_traits/add_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/add_unsigned_integer_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_integer_neg.cc: Same.
* testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc: Same.
From-SVN: r169421
2011-01-30 23:39:36 +01:00
|
|
|
namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
|
|
|
|
{
|
|
|
|
_GLIBCXX_BEGIN_NAMESPACE_VERSION
|
2008-06-29 17:46:50 +02:00
|
|
|
|
|
|
|
// 21.4 Numeric Conversions [string.conversions].
|
|
|
|
inline int
|
|
|
|
stoi(const __vstring& __str, std::size_t* __idx = 0, int __base = 10)
|
|
|
|
{ return __gnu_cxx::__stoa<long, int>(&std::strtol, "stoi", __str.c_str(),
|
|
|
|
__idx, __base); }
|
|
|
|
|
|
|
|
inline long
|
|
|
|
stol(const __vstring& __str, std::size_t* __idx = 0, int __base = 10)
|
|
|
|
{ return __gnu_cxx::__stoa(&std::strtol, "stol", __str.c_str(),
|
|
|
|
__idx, __base); }
|
|
|
|
|
|
|
|
inline unsigned long
|
|
|
|
stoul(const __vstring& __str, std::size_t* __idx = 0, int __base = 10)
|
|
|
|
{ return __gnu_cxx::__stoa(&std::strtoul, "stoul", __str.c_str(),
|
|
|
|
__idx, __base); }
|
|
|
|
|
|
|
|
inline long long
|
|
|
|
stoll(const __vstring& __str, std::size_t* __idx = 0, int __base = 10)
|
|
|
|
{ return __gnu_cxx::__stoa(&std::strtoll, "stoll", __str.c_str(),
|
|
|
|
__idx, __base); }
|
|
|
|
|
|
|
|
inline unsigned long long
|
|
|
|
stoull(const __vstring& __str, std::size_t* __idx, int __base = 10)
|
|
|
|
{ return __gnu_cxx::__stoa(&std::strtoull, "stoull", __str.c_str(),
|
|
|
|
__idx, __base); }
|
|
|
|
|
|
|
|
// NB: strtof vs strtod.
|
|
|
|
inline float
|
|
|
|
stof(const __vstring& __str, std::size_t* __idx = 0)
|
|
|
|
{ return __gnu_cxx::__stoa(&std::strtof, "stof", __str.c_str(), __idx); }
|
|
|
|
|
|
|
|
inline double
|
|
|
|
stod(const __vstring& __str, std::size_t* __idx = 0)
|
|
|
|
{ return __gnu_cxx::__stoa(&std::strtod, "stod", __str.c_str(), __idx); }
|
|
|
|
|
|
|
|
inline long double
|
|
|
|
stold(const __vstring& __str, std::size_t* __idx = 0)
|
|
|
|
{ return __gnu_cxx::__stoa(&std::strtold, "stold", __str.c_str(), __idx); }
|
|
|
|
|
|
|
|
// NB: (v)snprintf vs sprintf.
|
basic_string.h (to_string(int), [...]): Add, per resolution of DR 1261.
2009-11-11 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/basic_string.h (to_string(int), to_string(unsigned),
to_string(long), to_string(unsigned long), to_string(float),
to_string(double), to_wstring(int), to_wstring(unsigned),
to_wstring(long), to_wstring(unsigned long), to_wstring(float),
to_wstring(double)): Add, per resolution of DR 1261.
* include/ext/vstring.h: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/char/
dr1261.cc: Add.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
dr1261.cc: Likewise.
From-SVN: r154102
2009-11-11 20:57:48 +01:00
|
|
|
|
|
|
|
// DR 1261.
|
|
|
|
inline __vstring
|
|
|
|
to_string(int __val)
|
|
|
|
{ return __gnu_cxx::__to_xstring<__vstring>(&std::vsnprintf, 4 * sizeof(int),
|
|
|
|
"%d", __val); }
|
|
|
|
|
|
|
|
inline __vstring
|
|
|
|
to_string(unsigned __val)
|
|
|
|
{ return __gnu_cxx::__to_xstring<__vstring>(&std::vsnprintf,
|
|
|
|
4 * sizeof(unsigned),
|
|
|
|
"%u", __val); }
|
|
|
|
|
|
|
|
inline __vstring
|
|
|
|
to_string(long __val)
|
|
|
|
{ return __gnu_cxx::__to_xstring<__vstring>(&std::vsnprintf,
|
|
|
|
4 * sizeof(long),
|
|
|
|
"%ld", __val); }
|
|
|
|
|
|
|
|
inline __vstring
|
|
|
|
to_string(unsigned long __val)
|
|
|
|
{ return __gnu_cxx::__to_xstring<__vstring>(&std::vsnprintf,
|
|
|
|
4 * sizeof(unsigned long),
|
|
|
|
"%lu", __val); }
|
|
|
|
|
|
|
|
|
2008-06-29 17:46:50 +02:00
|
|
|
inline __vstring
|
|
|
|
to_string(long long __val)
|
|
|
|
{ return __gnu_cxx::__to_xstring<__vstring>(&std::vsnprintf,
|
|
|
|
4 * sizeof(long long),
|
|
|
|
"%lld", __val); }
|
|
|
|
|
|
|
|
inline __vstring
|
|
|
|
to_string(unsigned long long __val)
|
|
|
|
{ return __gnu_cxx::__to_xstring<__vstring>(&std::vsnprintf,
|
|
|
|
4 * sizeof(unsigned long long),
|
|
|
|
"%llu", __val); }
|
|
|
|
|
basic_string.h (to_string(int), [...]): Add, per resolution of DR 1261.
2009-11-11 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/basic_string.h (to_string(int), to_string(unsigned),
to_string(long), to_string(unsigned long), to_string(float),
to_string(double), to_wstring(int), to_wstring(unsigned),
to_wstring(long), to_wstring(unsigned long), to_wstring(float),
to_wstring(double)): Add, per resolution of DR 1261.
* include/ext/vstring.h: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/char/
dr1261.cc: Add.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
dr1261.cc: Likewise.
From-SVN: r154102
2009-11-11 20:57:48 +01:00
|
|
|
inline __vstring
|
|
|
|
to_string(float __val)
|
|
|
|
{
|
|
|
|
const int __n = __numeric_traits<float>::__max_exponent10 + 20;
|
|
|
|
return __gnu_cxx::__to_xstring<__vstring>(&std::vsnprintf, __n,
|
|
|
|
"%f", __val);
|
|
|
|
}
|
|
|
|
|
|
|
|
inline __vstring
|
|
|
|
to_string(double __val)
|
|
|
|
{
|
|
|
|
const int __n = __numeric_traits<double>::__max_exponent10 + 20;
|
|
|
|
return __gnu_cxx::__to_xstring<__vstring>(&std::vsnprintf, __n,
|
|
|
|
"%f", __val);
|
|
|
|
}
|
|
|
|
|
2008-06-29 17:46:50 +02:00
|
|
|
inline __vstring
|
|
|
|
to_string(long double __val)
|
|
|
|
{
|
|
|
|
const int __n = __numeric_traits<long double>::__max_exponent10 + 20;
|
|
|
|
return __gnu_cxx::__to_xstring<__vstring>(&std::vsnprintf, __n,
|
|
|
|
"%Lf", __val);
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef _GLIBCXX_USE_WCHAR_T
|
|
|
|
inline int
|
|
|
|
stoi(const __wvstring& __str, std::size_t* __idx = 0, int __base = 10)
|
|
|
|
{ return __gnu_cxx::__stoa<long, int>(&std::wcstol, "stoi", __str.c_str(),
|
|
|
|
__idx, __base); }
|
|
|
|
|
|
|
|
inline long
|
|
|
|
stol(const __wvstring& __str, std::size_t* __idx = 0, int __base = 10)
|
|
|
|
{ return __gnu_cxx::__stoa(&std::wcstol, "stol", __str.c_str(),
|
|
|
|
__idx, __base); }
|
|
|
|
|
|
|
|
inline unsigned long
|
|
|
|
stoul(const __wvstring& __str, std::size_t* __idx = 0, int __base = 10)
|
|
|
|
{ return __gnu_cxx::__stoa(&std::wcstoul, "stoul", __str.c_str(),
|
|
|
|
__idx, __base); }
|
|
|
|
|
|
|
|
inline long long
|
|
|
|
stoll(const __wvstring& __str, std::size_t* __idx = 0, int __base = 10)
|
|
|
|
{ return __gnu_cxx::__stoa(&std::wcstoll, "stoll", __str.c_str(),
|
|
|
|
__idx, __base); }
|
|
|
|
|
|
|
|
inline unsigned long long
|
|
|
|
stoull(const __wvstring& __str, std::size_t* __idx = 0, int __base = 10)
|
|
|
|
{ return __gnu_cxx::__stoa(&std::wcstoull, "stoull", __str.c_str(),
|
|
|
|
__idx, __base); }
|
|
|
|
|
|
|
|
// NB: wcstof vs wcstod.
|
|
|
|
inline float
|
|
|
|
stof(const __wvstring& __str, std::size_t* __idx = 0)
|
|
|
|
{ return __gnu_cxx::__stoa(&std::wcstof, "stof", __str.c_str(), __idx); }
|
|
|
|
|
|
|
|
inline double
|
|
|
|
stod(const __wvstring& __str, std::size_t* __idx = 0)
|
|
|
|
{ return __gnu_cxx::__stoa(&std::wcstod, "stod", __str.c_str(), __idx); }
|
|
|
|
|
|
|
|
inline long double
|
|
|
|
stold(const __wvstring& __str, std::size_t* __idx = 0)
|
|
|
|
{ return __gnu_cxx::__stoa(&std::wcstold, "stold", __str.c_str(), __idx); }
|
|
|
|
|
2009-09-18 01:53:28 +02:00
|
|
|
#ifndef _GLIBCXX_HAVE_BROKEN_VSWPRINTF
|
basic_string.h (to_string(int), [...]): Add, per resolution of DR 1261.
2009-11-11 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/basic_string.h (to_string(int), to_string(unsigned),
to_string(long), to_string(unsigned long), to_string(float),
to_string(double), to_wstring(int), to_wstring(unsigned),
to_wstring(long), to_wstring(unsigned long), to_wstring(float),
to_wstring(double)): Add, per resolution of DR 1261.
* include/ext/vstring.h: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/char/
dr1261.cc: Add.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
dr1261.cc: Likewise.
From-SVN: r154102
2009-11-11 20:57:48 +01:00
|
|
|
// DR 1261.
|
|
|
|
inline __wvstring
|
|
|
|
to_wstring(int __val)
|
|
|
|
{ return __gnu_cxx::__to_xstring<__wvstring>(&std::vswprintf,
|
|
|
|
4 * sizeof(int),
|
|
|
|
L"%d", __val); }
|
|
|
|
|
|
|
|
inline __wvstring
|
|
|
|
to_wstring(unsigned __val)
|
|
|
|
{ return __gnu_cxx::__to_xstring<__wvstring>(&std::vswprintf,
|
|
|
|
4 * sizeof(unsigned),
|
|
|
|
L"%u", __val); }
|
|
|
|
|
|
|
|
inline __wvstring
|
|
|
|
to_wstring(long __val)
|
|
|
|
{ return __gnu_cxx::__to_xstring<__wvstring>(&std::vswprintf,
|
|
|
|
4 * sizeof(long),
|
|
|
|
L"%ld", __val); }
|
|
|
|
|
|
|
|
inline __wvstring
|
|
|
|
to_wstring(unsigned long __val)
|
|
|
|
{ return __gnu_cxx::__to_xstring<__wvstring>(&std::vswprintf,
|
|
|
|
4 * sizeof(unsigned long),
|
|
|
|
L"%lu", __val); }
|
|
|
|
|
2008-06-29 17:46:50 +02:00
|
|
|
inline __wvstring
|
|
|
|
to_wstring(long long __val)
|
|
|
|
{ return __gnu_cxx::__to_xstring<__wvstring>(&std::vswprintf,
|
|
|
|
4 * sizeof(long long),
|
|
|
|
L"%lld", __val); }
|
|
|
|
|
|
|
|
inline __wvstring
|
|
|
|
to_wstring(unsigned long long __val)
|
|
|
|
{ return __gnu_cxx::__to_xstring<__wvstring>(&std::vswprintf,
|
|
|
|
4 * sizeof(unsigned long long),
|
|
|
|
L"%llu", __val); }
|
|
|
|
|
basic_string.h (to_string(int), [...]): Add, per resolution of DR 1261.
2009-11-11 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/basic_string.h (to_string(int), to_string(unsigned),
to_string(long), to_string(unsigned long), to_string(float),
to_string(double), to_wstring(int), to_wstring(unsigned),
to_wstring(long), to_wstring(unsigned long), to_wstring(float),
to_wstring(double)): Add, per resolution of DR 1261.
* include/ext/vstring.h: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/char/
dr1261.cc: Add.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
dr1261.cc: Likewise.
From-SVN: r154102
2009-11-11 20:57:48 +01:00
|
|
|
inline __wvstring
|
|
|
|
to_wstring(float __val)
|
|
|
|
{
|
|
|
|
const int __n = __numeric_traits<float>::__max_exponent10 + 20;
|
|
|
|
return __gnu_cxx::__to_xstring<__wvstring>(&std::vswprintf, __n,
|
|
|
|
L"%f", __val);
|
|
|
|
}
|
|
|
|
|
|
|
|
inline __wvstring
|
|
|
|
to_wstring(double __val)
|
|
|
|
{
|
|
|
|
const int __n = __numeric_traits<double>::__max_exponent10 + 20;
|
|
|
|
return __gnu_cxx::__to_xstring<__wvstring>(&std::vswprintf, __n,
|
|
|
|
L"%f", __val);
|
|
|
|
}
|
|
|
|
|
2008-06-29 17:46:50 +02:00
|
|
|
inline __wvstring
|
|
|
|
to_wstring(long double __val)
|
|
|
|
{
|
|
|
|
const int __n = __numeric_traits<long double>::__max_exponent10 + 20;
|
|
|
|
return __gnu_cxx::__to_xstring<__wvstring>(&std::vswprintf, __n,
|
|
|
|
L"%Lf", __val);
|
|
|
|
}
|
|
|
|
#endif
|
2009-09-18 01:53:28 +02:00
|
|
|
#endif
|
2008-06-29 17:46:50 +02:00
|
|
|
|
PR libstdc++/36104 part four
2011-01-30 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/36104 part four
* include/bits/c++config (_GLIBCXX_STD): Remove.
(_GLIBCXX_STD_D, _GLIBCXX_PR): Now _GLIBCXX_STD_C.
(_GLIBCXX_P): Now _GLIBCXX_STD_A.
(_GLIBCXX_NAMESPACE_DEBUG, _GLIBCXX_NAMESPACE_PARALLEL,
_GLIBCXX_NAMESPACE_PROFILE, _GLIBCXX_NAMESPACE_VERSION): Remove.
(_GLIBCXX_INLINE_DEBUG, _GLIBCXX_INLINE_PARALLEL,
_GLIBCXX_INLINE_PROFILE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE(X)): Remove.
(_GLIBCXX_END_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NESTED_NAMESPACE(X, Y)): Remove.
(_GLIBCXX_END_NESTED_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE_ALGO): Add.
(_GLIBCXX_END_NAMESPACE_ALGO): Add.
(_GLIBCXX_BEGIN_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_END_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_BEGIN_NAMESPACE_VERSION): Add.
(_GLIBCXX_END_NAMESPACE_VERSION): Add.
(_GLIBCXX_BEGIN_LDBL_NAMESPACE): To _GLIBCXX_BEGIN_NAMESPACE_LDBL.
(_GLIBCXX_END_LDBL_NAMESPACE): To _GLIBCXX_END_NAMESPACE_LDBL.
(_GLIBCXX_VISIBILITY_ATTR): Revert to _GLIBCXX_VISIBILITY.
* include/*: Use new macros for namespace scope.
* config/*: Same.
* src/*: Same.
* src/Makefile.am (sources): Remove debug_list.cc, add
compatibility-debug_list-2.cc.
(parallel_sources): Remove parallel_list.cc, add
compatibility-parallel_list-2.cc.
(compatibility-parallel_list-2.[o,lo]): New rule.
* src/Makefile.in: Regenerate.
* src/debug_list.cc: Remove.
* src/parallel_list.cc: Remove.
* src/compatibility-list-2.cc: New.
* src/compatibility-debug_list-2.cc: New.
* src/compatibility-parallel_list-2.cc: New.
* doc/doxygen/user.cfg.in: Adjust macros.
* testsuite/20_util/auto_ptr/assign_neg.cc: Adjust line numbers, macros.
* testsuite/20_util/declval/requirements/1_neg.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg1.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg2.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg3.cc: Same.
* testsuite/20_util/forward/c_neg.cc: Same.
* testsuite/20_util/forward/f_neg.cc: Same.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Same.
* testsuite/20_util/ratio/operations/ops_overflow_neg.cc: Same.
* testsuite/20_util/shared_ptr/cons/43820_neg.cc: Same.
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/forward_list/capacity/1.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
assign_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
insert_neg.cc: Same.
* testsuite/23_containers/list/capacity/29134.cc: Same.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/vector/bool/capacity/29134.cc: Same.
* testsuite/23_containers/vector/bool/modifiers/insert/31370.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: Same.
* testsuite/25_algorithms/sort/35588.cc: Same.
* testsuite/27_io/ios_base/cons/assign_neg.cc: Same.
* testsuite/27_io/ios_base/cons/copy_neg.cc: Same.
* testsuite/ext/profile/mutex_extensions_neg.cc: Same.
* testsuite/ext/profile/profiler_algos.cc: Same.
* testsuite/ext/type_traits/add_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/add_unsigned_integer_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_integer_neg.cc: Same.
* testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc: Same.
From-SVN: r169421
2011-01-30 23:39:36 +01:00
|
|
|
_GLIBCXX_END_NAMESPACE_VERSION
|
|
|
|
} // namespace
|
2008-06-29 17:46:50 +02:00
|
|
|
|
|
|
|
#endif
|
|
|
|
|
2012-11-10 18:27:22 +01:00
|
|
|
#if __cplusplus >= 201103L
|
2011-02-17 02:24:37 +01:00
|
|
|
|
|
|
|
#include <bits/functional_hash.h>
|
|
|
|
|
|
|
|
namespace std _GLIBCXX_VISIBILITY(default)
|
|
|
|
{
|
|
|
|
_GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|
|
|
|
|
|
|
/// std::hash specialization for __vstring.
|
|
|
|
template<>
|
|
|
|
struct hash<__gnu_cxx::__vstring>
|
|
|
|
: public __hash_base<size_t, __gnu_cxx::__vstring>
|
|
|
|
{
|
|
|
|
size_t
|
hash-long-double-aux.cc: Rename to...
2011-11-18 Paolo Carlini <paolo.carlini@oracle.com>
* src/hash-long-double-aux.cc: Rename to...
* src/hash-long-double-tr1-aux.cc: ... this.
* src/compatibility-ldbl.cc: Adjust.
* src/hash_tr1.cc: Likewise.
* src/hash_c++0x.cc: Don't use src/hash-long-double-aux.cc.
* include/bits/functional_hash.h (hash<_Tp*>::operator(), specs
for integer types, hash<float>::operator(), hash<double>::operator(),
hash<long double>::operator()): Declare noexcept.
* include/debug/bitset (hash<__debug::bitset>::operator()): Likewise.
* include/debug/vector (hash<__debug::vector>::operator()): Likewise.
* include/std/system_error (hash<error_code>::operator()): Likewise.
* include/std/thread (hash<thread::id>::operator()): Likewise.
* include/std/bitset (hash<bitset>::operator()): Likewise.
* include/std/typeindex (hash<type_index>::operator()): Likewise.
* include/profile/bitset (hash<__profile::vector>::operator()):
Likewise.
* include/profile/vector (hash<__profile::vector>::operator()):
Likewise.
* include/ext/vstring.h (hash<__vstring>::operator(),
hash<__wvstring>::operator(), hash<__u16vstring>::operator(),
hash<__u32vstring>::operator()): Likewise.
* include/bits/shared_ptr.h (hash<shared_ptr>::operator()): Likewise.
* include/bits/shared_ptr_base.h (hash<__shared_ptr>::operator()):
Likewise.
* include/bits/unique_ptr.h (hash<unique_ptr>::operator()): Likewise.
* include/bits/basic_string.h (hash<string>::operator(),
hash<wstring>::operator(), hash<u16string>::operator(),
hash<u32string>::operator()): Likewise.
* include/bits/vector.tcc (hash<vector>::operator()): Likewise.
* include/bits/stl_bvector.h (hash<vector>::operator()): Likewise.
* libsupc++/typeinfo (type_info::hash_code): Use noexcept instead of
throw().
From-SVN: r181473
2011-11-18 13:37:06 +01:00
|
|
|
operator()(const __gnu_cxx::__vstring& __s) const noexcept
|
2011-02-17 02:24:37 +01:00
|
|
|
{ return std::_Hash_impl::hash(__s.data(), __s.length()); }
|
|
|
|
};
|
|
|
|
|
|
|
|
#ifdef _GLIBCXX_USE_WCHAR_T
|
|
|
|
/// std::hash specialization for __wvstring.
|
|
|
|
template<>
|
|
|
|
struct hash<__gnu_cxx::__wvstring>
|
|
|
|
: public __hash_base<size_t, __gnu_cxx::__wvstring>
|
|
|
|
{
|
|
|
|
size_t
|
hash-long-double-aux.cc: Rename to...
2011-11-18 Paolo Carlini <paolo.carlini@oracle.com>
* src/hash-long-double-aux.cc: Rename to...
* src/hash-long-double-tr1-aux.cc: ... this.
* src/compatibility-ldbl.cc: Adjust.
* src/hash_tr1.cc: Likewise.
* src/hash_c++0x.cc: Don't use src/hash-long-double-aux.cc.
* include/bits/functional_hash.h (hash<_Tp*>::operator(), specs
for integer types, hash<float>::operator(), hash<double>::operator(),
hash<long double>::operator()): Declare noexcept.
* include/debug/bitset (hash<__debug::bitset>::operator()): Likewise.
* include/debug/vector (hash<__debug::vector>::operator()): Likewise.
* include/std/system_error (hash<error_code>::operator()): Likewise.
* include/std/thread (hash<thread::id>::operator()): Likewise.
* include/std/bitset (hash<bitset>::operator()): Likewise.
* include/std/typeindex (hash<type_index>::operator()): Likewise.
* include/profile/bitset (hash<__profile::vector>::operator()):
Likewise.
* include/profile/vector (hash<__profile::vector>::operator()):
Likewise.
* include/ext/vstring.h (hash<__vstring>::operator(),
hash<__wvstring>::operator(), hash<__u16vstring>::operator(),
hash<__u32vstring>::operator()): Likewise.
* include/bits/shared_ptr.h (hash<shared_ptr>::operator()): Likewise.
* include/bits/shared_ptr_base.h (hash<__shared_ptr>::operator()):
Likewise.
* include/bits/unique_ptr.h (hash<unique_ptr>::operator()): Likewise.
* include/bits/basic_string.h (hash<string>::operator(),
hash<wstring>::operator(), hash<u16string>::operator(),
hash<u32string>::operator()): Likewise.
* include/bits/vector.tcc (hash<vector>::operator()): Likewise.
* include/bits/stl_bvector.h (hash<vector>::operator()): Likewise.
* libsupc++/typeinfo (type_info::hash_code): Use noexcept instead of
throw().
From-SVN: r181473
2011-11-18 13:37:06 +01:00
|
|
|
operator()(const __gnu_cxx::__wvstring& __s) const noexcept
|
2011-02-17 02:24:37 +01:00
|
|
|
{ return std::_Hash_impl::hash(__s.data(),
|
|
|
|
__s.length() * sizeof(wchar_t)); }
|
|
|
|
};
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef _GLIBCXX_USE_C99_STDINT_TR1
|
|
|
|
/// std::hash specialization for __u16vstring.
|
|
|
|
template<>
|
|
|
|
struct hash<__gnu_cxx::__u16vstring>
|
|
|
|
: public __hash_base<size_t, __gnu_cxx::__u16vstring>
|
|
|
|
{
|
|
|
|
size_t
|
hash-long-double-aux.cc: Rename to...
2011-11-18 Paolo Carlini <paolo.carlini@oracle.com>
* src/hash-long-double-aux.cc: Rename to...
* src/hash-long-double-tr1-aux.cc: ... this.
* src/compatibility-ldbl.cc: Adjust.
* src/hash_tr1.cc: Likewise.
* src/hash_c++0x.cc: Don't use src/hash-long-double-aux.cc.
* include/bits/functional_hash.h (hash<_Tp*>::operator(), specs
for integer types, hash<float>::operator(), hash<double>::operator(),
hash<long double>::operator()): Declare noexcept.
* include/debug/bitset (hash<__debug::bitset>::operator()): Likewise.
* include/debug/vector (hash<__debug::vector>::operator()): Likewise.
* include/std/system_error (hash<error_code>::operator()): Likewise.
* include/std/thread (hash<thread::id>::operator()): Likewise.
* include/std/bitset (hash<bitset>::operator()): Likewise.
* include/std/typeindex (hash<type_index>::operator()): Likewise.
* include/profile/bitset (hash<__profile::vector>::operator()):
Likewise.
* include/profile/vector (hash<__profile::vector>::operator()):
Likewise.
* include/ext/vstring.h (hash<__vstring>::operator(),
hash<__wvstring>::operator(), hash<__u16vstring>::operator(),
hash<__u32vstring>::operator()): Likewise.
* include/bits/shared_ptr.h (hash<shared_ptr>::operator()): Likewise.
* include/bits/shared_ptr_base.h (hash<__shared_ptr>::operator()):
Likewise.
* include/bits/unique_ptr.h (hash<unique_ptr>::operator()): Likewise.
* include/bits/basic_string.h (hash<string>::operator(),
hash<wstring>::operator(), hash<u16string>::operator(),
hash<u32string>::operator()): Likewise.
* include/bits/vector.tcc (hash<vector>::operator()): Likewise.
* include/bits/stl_bvector.h (hash<vector>::operator()): Likewise.
* libsupc++/typeinfo (type_info::hash_code): Use noexcept instead of
throw().
From-SVN: r181473
2011-11-18 13:37:06 +01:00
|
|
|
operator()(const __gnu_cxx::__u16vstring& __s) const noexcept
|
2011-02-17 02:24:37 +01:00
|
|
|
{ return std::_Hash_impl::hash(__s.data(),
|
|
|
|
__s.length() * sizeof(char16_t)); }
|
|
|
|
};
|
|
|
|
|
|
|
|
/// std::hash specialization for __u32vstring.
|
|
|
|
template<>
|
|
|
|
struct hash<__gnu_cxx::__u32vstring>
|
|
|
|
: public __hash_base<size_t, __gnu_cxx::__u32vstring>
|
|
|
|
{
|
|
|
|
size_t
|
hash-long-double-aux.cc: Rename to...
2011-11-18 Paolo Carlini <paolo.carlini@oracle.com>
* src/hash-long-double-aux.cc: Rename to...
* src/hash-long-double-tr1-aux.cc: ... this.
* src/compatibility-ldbl.cc: Adjust.
* src/hash_tr1.cc: Likewise.
* src/hash_c++0x.cc: Don't use src/hash-long-double-aux.cc.
* include/bits/functional_hash.h (hash<_Tp*>::operator(), specs
for integer types, hash<float>::operator(), hash<double>::operator(),
hash<long double>::operator()): Declare noexcept.
* include/debug/bitset (hash<__debug::bitset>::operator()): Likewise.
* include/debug/vector (hash<__debug::vector>::operator()): Likewise.
* include/std/system_error (hash<error_code>::operator()): Likewise.
* include/std/thread (hash<thread::id>::operator()): Likewise.
* include/std/bitset (hash<bitset>::operator()): Likewise.
* include/std/typeindex (hash<type_index>::operator()): Likewise.
* include/profile/bitset (hash<__profile::vector>::operator()):
Likewise.
* include/profile/vector (hash<__profile::vector>::operator()):
Likewise.
* include/ext/vstring.h (hash<__vstring>::operator(),
hash<__wvstring>::operator(), hash<__u16vstring>::operator(),
hash<__u32vstring>::operator()): Likewise.
* include/bits/shared_ptr.h (hash<shared_ptr>::operator()): Likewise.
* include/bits/shared_ptr_base.h (hash<__shared_ptr>::operator()):
Likewise.
* include/bits/unique_ptr.h (hash<unique_ptr>::operator()): Likewise.
* include/bits/basic_string.h (hash<string>::operator(),
hash<wstring>::operator(), hash<u16string>::operator(),
hash<u32string>::operator()): Likewise.
* include/bits/vector.tcc (hash<vector>::operator()): Likewise.
* include/bits/stl_bvector.h (hash<vector>::operator()): Likewise.
* libsupc++/typeinfo (type_info::hash_code): Use noexcept instead of
throw().
From-SVN: r181473
2011-11-18 13:37:06 +01:00
|
|
|
operator()(const __gnu_cxx::__u32vstring& __s) const noexcept
|
2011-02-17 02:24:37 +01:00
|
|
|
{ return std::_Hash_impl::hash(__s.data(),
|
|
|
|
__s.length() * sizeof(char32_t)); }
|
|
|
|
};
|
|
|
|
#endif
|
|
|
|
|
|
|
|
_GLIBCXX_END_NAMESPACE_VERSION
|
|
|
|
} // namespace
|
|
|
|
|
2012-11-10 18:27:22 +01:00
|
|
|
#endif // C++11
|
2011-02-17 02:24:37 +01:00
|
|
|
|
2011-01-21 20:41:13 +01:00
|
|
|
#include "vstring.tcc"
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
#endif /* _VSTRING_H */
|