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

basic_string.h (insert(size_type, const basic_string&, size_type, size_type)): Define inline here. 

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

	* include/bits/basic_string.h (insert(size_type,
	const basic_string&, size_type, size_type)): Define inline here.
	* include/bits/basic_string.tcc (insert(size_type,
	const basic_string&, size_type, size_type)): Move inline.

From-SVN: r76509
This commit is contained in:
Paolo Carlini 2004-01-24 12:32:54 +00:00 committed by Paolo Carlini
parent fefe561e80
commit 8865bf80ee
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,10 @@
2004-01-24 Paolo Carlini <pcarlini@suse.de>
* include/bits/basic_string.h (insert(size_type,
const basic_string&, size_type, size_type)): Define inline here.
* include/bits/basic_string.tcc (insert(size_type,
const basic_string&, size_type, size_type)): Move inline.
2004-01-24 Paolo Carlini <pcarlini@suse.de>
* include/bits/basic_string.h (assign(const basic_string&,

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

@ -920,7 +920,10 @@ namespace std
*/
basic_string&
insert(size_type __pos1, const basic_string& __str,
size_type __pos2, size_type __n);
size_type __pos2, size_type __n)
{ return this->insert(__pos1, __str._M_data()
+ __str._M_check(__pos2, "basic_string::insert"),
__str._M_limit(__pos2, __n)); }
/**
* @brief Insert a C substring.

11
libstdc++-v3/include/bits/basic_string.tcc
View File

@ -292,17 +292,6 @@ namespace std
}
}
template<typename _CharT, typename _Traits, typename _Alloc>
basic_string<_CharT, _Traits, _Alloc>&
basic_string<_CharT, _Traits, _Alloc>::
insert(size_type __pos1, const basic_string& __str,
size_type __pos2, size_type __n)
{
return this->insert(__pos1, __str._M_data()
+ __str._M_check(__pos2, "basic_string::insert"),
__str._M_limit(__pos2, __n));
}
template<typename _CharT, typename _Traits, typename _Alloc>
basic_string<_CharT, _Traits, _Alloc>&
basic_string<_CharT, _Traits, _Alloc>::