OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

basic_string.h (replace(iterator, iterator, const basic_string&)): Remove _GLIBCXX_DEBUG_PEDASSERT. 

2004-01-26  Paolo Carlini  <pcarlini@suse.de>

	* include/bits/basic_string.h (replace(iterator, iterator,
	const basic_string&)): Remove _GLIBCXX_DEBUG_PEDASSERT.
	(replace(iterator, iterator, const _CharT*)): Ditto.
	(replace(iterator, iterator, const _CharT*, size_type)):
	Add missing _GLIBCXX_DEBUG_PEDASSERT.

From-SVN: r76630
This commit is contained in:
Paolo Carlini 2004-01-26 12:58:53 +00:00 committed by Paolo Carlini
parent a7bba6ca0e
commit 4d39d873e0
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,11 @@
2004-01-26 Paolo Carlini <pcarlini@suse.de>
* include/bits/basic_string.h (replace(iterator, iterator,
const basic_string&)): Remove _GLIBCXX_DEBUG_PEDASSERT.
(replace(iterator, iterator, const _CharT*)): Ditto.
(replace(iterator, iterator, const _CharT*, size_type)):
Add missing _GLIBCXX_DEBUG_PEDASSERT.
2004-01-26 Paolo Carlini <pcarlini@suse.de>
* include/bits/basic_string.tcc (replace(size_type,

17
libstdc++-v3/include/bits/basic_string.h
View File

@ -1209,11 +1209,7 @@ namespace std
*/
basic_string&
replace(iterator __i1, iterator __i2, const basic_string& __str)
{
_GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
&& __i2 <= _M_iend());
return this->replace(__i1, __i2, __str._M_data(), __str.size());
}
{ return this->replace(__i1, __i2, __str._M_data(), __str.size()); }
/**
* @brief Replace range of characters with C substring.
@ -1230,9 +1226,12 @@ namespace std
* change if an error is thrown.
*/
basic_string&
replace(iterator __i1, iterator __i2,
const _CharT* __s, size_type __n)
{ return this->replace(__i1 - _M_ibegin(), __i2 - __i1, __s, __n); }
replace(iterator __i1, iterator __i2, const _CharT* __s, size_type __n)
{
_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.
@ -1250,8 +1249,6 @@ namespace std
basic_string&
replace(iterator __i1, iterator __i2, const _CharT* __s)
{
_GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
&& __i2 <= _M_iend());
__glibcxx_requires_string(__s);
return this->replace(__i1, __i2, __s, traits_type::length(__s));
}