diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2009-10-15 01:16:53 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2009-10-15 01:16:53 +0000 |
| commit | 5cab70136913d6b6ab56de94620f0d62497c0460 (patch) | |
| tree | 89c751b3933349161a98cf0bf17cf9ef1e723b7a | |
| parent | b2b5d6e34da7c08896ebde074652729c847238fc (diff) | |
| download | gcc-5cab70136913d6b6ab56de94620f0d62497c0460.zip gcc-5cab70136913d6b6ab56de94620f0d62497c0460.tar.gz gcc-5cab70136913d6b6ab56de94620f0d62497c0460.tar.bz2 | |
basic_string.h (operator+=(initializer_list<>), [...]): Forward to the append overload taking a const CharT* pointer and a size...
2009-10-14 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/basic_string.h (operator+=(initializer_list<>),
append(initializer_list<>)): Forward to the append overload taking
a const CharT* pointer and a size, thus avoiding instantiating
unnecessarily in the built library the overload taking a pair of
iterators.
(operator=(initializer_list<>), assign(initializer_list<>)): Likewise
for assign.
(insert(iterator, initializer_list<>): Likewise for insert.
From-SVN: r152794
| -rw-r--r-- | libstdc++-v3/ChangeLog | 11 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/basic_string.h | 13 |
2 files changed, 19 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c995c7d..31bbb59 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,16 @@ 2009-10-14 Paolo Carlini <paolo.carlini@oracle.com> + * include/bits/basic_string.h (operator+=(initializer_list<>), + append(initializer_list<>)): Forward to the append overload taking + a const CharT* pointer and a size, thus avoiding instantiating + unnecessarily in the built library the overload taking a pair of + iterators. + (operator=(initializer_list<>), assign(initializer_list<>)): Likewise + for assign. + (insert(iterator, initializer_list<>): Likewise for insert. + +2009-10-14 Paolo Carlini <paolo.carlini@oracle.com> + * include/bits/c++config: Do not disable extern templates for string in plain parallel-mode and in profile-mode; add comment explaining _GLIBCXX_EXTERN_TEMPLATE == -1. diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h index bd54537..9d44dc4 100644 --- a/libstdc++-v3/include/bits/basic_string.h +++ b/libstdc++-v3/include/bits/basic_string.h @@ -540,7 +540,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) basic_string& operator=(initializer_list<_CharT> __l) { - this->assign (__l.begin(), __l.end()); + this->assign(__l.begin(), __l.size()); return *this; } #endif // __GXX_EXPERIMENTAL_CXX0X__ @@ -860,7 +860,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) */ basic_string& operator+=(initializer_list<_CharT> __l) - { return this->append(__l.begin(), __l.end()); } + { return this->append(__l.begin(), __l.size()); } #endif // __GXX_EXPERIMENTAL_CXX0X__ /** @@ -926,7 +926,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) */ basic_string& append(initializer_list<_CharT> __l) - { return this->append(__l.begin(), __l.end()); } + { return this->append(__l.begin(), __l.size()); } #endif // __GXX_EXPERIMENTAL_CXX0X__ /** @@ -1045,7 +1045,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) */ basic_string& assign(initializer_list<_CharT> __l) - { return this->assign(__l.begin(), __l.end()); } + { return this->assign(__l.begin(), __l.size()); } #endif // __GXX_EXPERIMENTAL_CXX0X__ /** @@ -1089,7 +1089,10 @@ _GLIBCXX_BEGIN_NAMESPACE(std) */ void insert(iterator __p, initializer_list<_CharT> __l) - { this->insert(__p, __l.begin(), __l.end()); } + { + _GLIBCXX_DEBUG_PEDASSERT(__p >= _M_ibegin() && __p <= _M_iend()); + this->insert(__p - _M_ibegin(), __l.begin(), __l.size()); + } #endif // __GXX_EXPERIMENTAL_CXX0X__ /** |