diff options
| author | Paolo Carlini <pcarlini@suse.de> | 2004-01-24 12:32:54 +0000 |
|---|---|---|
| committer | Paolo Carlini <pcarlini@suse.de> | 2004-01-24 12:32:54 +0000 |
| commit | 16c205cff76b0c2abeba2f44f78d8ffbc3fac0cf (patch) | |
| tree | 2ea0aa27519b0e61e91a11744da955b0b9836a9e | |
| parent | eaa5100b11419846f6fc1b28cc93f4de2ceb778e (diff) | |
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.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@76509 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/basic_string.h | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/basic_string.tcc | 11 |
3 files changed, 11 insertions, 12 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 2f1da9ecab3..01e3dc23d71 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,12 @@ 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&, size_type, size_type)): Define inline here. (replace(size_type, size_type, const basic_string&, diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h index 9e375835060..eb160d34946 100644 --- a/libstdc++-v3/include/bits/basic_string.h +++ b/libstdc++-v3/include/bits/basic_string.h @@ -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. diff --git a/libstdc++-v3/include/bits/basic_string.tcc b/libstdc++-v3/include/bits/basic_string.tcc index a7638dfe57c..01919a473a1 100644 --- a/libstdc++-v3/include/bits/basic_string.tcc +++ b/libstdc++-v3/include/bits/basic_string.tcc @@ -295,17 +295,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>:: insert(size_type __pos, const _CharT* __s, size_type __n) { __glibcxx_requires_string_len(__s, __n); |