diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2009-12-10 17:17:41 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2009-12-10 17:17:41 +0000 |
| commit | 574f366488bbe1bf3075735278242a92be85f40b (patch) | |
| tree | f4257a360746fb0d218931cd67170528eae68722 /libstdc++-v3/include/ext/rc_string_base.h | |
| parent | 788d04b2b499af9cbcb8ef0f2ffdd7359825c1e0 (diff) | |
| download | gcc-574f366488bbe1bf3075735278242a92be85f40b.zip gcc-574f366488bbe1bf3075735278242a92be85f40b.tar.gz gcc-574f366488bbe1bf3075735278242a92be85f40b.tar.bz2 | |
revert: re PR libstdc++/42261 (infinite recursion from string(string::size_type(6), string::size_type('f')))
2009-12-10 Paolo Carlini <paolo.carlini@oracle.com>
Revert:
2009-12-03 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/42261
* include/bits/basic_string.h (_S_construct_aux(_Integer, _Integer,
const _Alloc&, __true_type)): Cast the second argument to value_type.
* include/ext/sso_string_base.h (_M_construct_aux(_Integer, _Integer,
std::__true_type)): Likewise.
* include/ext/rc_string_base.h (_S_construct_aux(_Integer, _Integer,
const _Alloc&, std::__true_type)): Likewise.
* testsuite/21_strings/basic_string/cons/char/42261.cc: New.
* testsuite/21_strings/basic_string/cons/wchar_t/42261.cc: Likewise.
From-SVN: r155132
Diffstat (limited to 'libstdc++-v3/include/ext/rc_string_base.h')
| -rw-r--r-- | libstdc++-v3/include/ext/rc_string_base.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libstdc++-v3/include/ext/rc_string_base.h b/libstdc++-v3/include/ext/rc_string_base.h index c9fdb25..6d8c430 100644 --- a/libstdc++-v3/include/ext/rc_string_base.h +++ b/libstdc++-v3/include/ext/rc_string_base.h @@ -231,8 +231,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) static _CharT* _S_construct_aux(_Integer __beg, _Integer __end, const _Alloc& __a, std::__true_type) - { return _S_construct(static_cast<size_type>(__beg), - static_cast<value_type>(__end), __a); } + { return _S_construct(static_cast<size_type>(__beg), __end, __a); } template<typename _InIterator> static _CharT* |