diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 75663202252..da30ea7f405 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,21 @@ +2009-12-10 Paolo Carlini + + PR libstdc++/42261 (take 2) + * include/bits/basic_string.h (_S_construct_aux_2(size_type, _CharT, + const _Alloc&)): Add. + (_S_construct_aux(_Integer, _Integer, const _Alloc&, __true_type)): + Call it. + * include/ext/sso_string_base.h (_M_construct_aux_2(size_type, + _CharT): Add. + (_M_construct_aux(_Integer, _Integer, std::__true_type)): Call it. + * include/ext/rc_string_base.h (_S_construct_aux_2(size_type, _CharT, + const _Alloc&)): Add. + (_S_construct_aux(_Integer, _Integer, const _Alloc&, __true_type)): + Call it. + * config/abi/pre/gnu.ver: Export basic_string::_S_construct_aux_2. + * testsuite/21_strings/basic_string/cons/char/42261.cc: New. + * testsuite/21_strings/basic_string/cons/wchar_t/42261.cc: Likewise. + 2009-12-10 Paolo Carlini Revert: diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver index b0001ca9a62..20baa966f39 100644 --- a/libstdc++-v3/config/abi/pre/gnu.ver +++ b/libstdc++-v3/config/abi/pre/gnu.ver @@ -1039,9 +1039,11 @@ GLIBCXX_3.4.14 { _ZNKSbIwSt11char_traitsIwESaIwEE7crbeginEv; _ZNKSbIwSt11char_traitsIwESaIwEE5crendEv; - # string|wstring ::_S_construct<> helpers + # string|wstring ::_S_construct<> and ::_S_construct_aux_2 helpers _ZNSs12_S_constructI*; _ZNSbIwSt11char_traitsIwESaIwEE12_S_constructI*; + _ZNSs18_S_construct_aux_2*; + _ZNSbIwSt11char_traitsIwESaIwEE18_S_construct_aux_2*; } GLIBCXX_3.4.13; diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h index 269a75ed468..8d24758d47c 100644 --- a/libstdc++-v3/include/bits/basic_string.h +++ b/libstdc++-v3/include/bits/basic_string.h @@ -1588,7 +1588,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std) static _CharT* _S_construct_aux(_Integer __beg, _Integer __end, const _Alloc& __a, __true_type) - { return _S_construct(static_cast(__beg), __end, __a); } + { return _S_construct_aux_2(static_cast(__beg), + __end, __a); } + + static _CharT* + _S_construct_aux_2(size_type __req, _CharT __c, const _Alloc& __a) + { return _S_construct(__req, __c, __a); } template static _CharT* diff --git a/libstdc++-v3/include/ext/rc_string_base.h b/libstdc++-v3/include/ext/rc_string_base.h index 6d8c430d575..d1b516274b3 100644 --- a/libstdc++-v3/include/ext/rc_string_base.h +++ b/libstdc++-v3/include/ext/rc_string_base.h @@ -231,7 +231,12 @@ _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(__beg), __end, __a); } + { return _S_construct_aux_2(static_cast(__beg), + __end, __a); } + + static _CharT* + _S_construct_aux_2(size_type __req, _CharT __c, const _Alloc& __a) + { return _S_construct(__req, __c, __a); } template static _CharT* diff --git a/libstdc++-v3/include/ext/sso_string_base.h b/libstdc++-v3/include/ext/sso_string_base.h index d88297fc36e..b0500cf17e0 100644 --- a/libstdc++-v3/include/ext/sso_string_base.h +++ b/libstdc++-v3/include/ext/sso_string_base.h @@ -106,7 +106,11 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) template void _M_construct_aux(_Integer __beg, _Integer __end, std::__true_type) - { _M_construct(static_cast(__beg), __end); } + { _M_construct_aux_2(static_cast(__beg), __end); } + + void + _M_construct_aux_2(size_type __req, _CharT __c) + { _M_construct(__req, __c); } template void diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/42261.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/42261.cc new file mode 100644 index 00000000000..a83b74ac735 --- /dev/null +++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/42261.cc @@ -0,0 +1,35 @@ +// Copyright (C) 2009 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include +#include + +// libstdc++/42261 +void test01() +{ + bool test __attribute__((unused)) = true; + using namespace std; + + const string s(string::size_type(6), string::size_type('f')); + VERIFY( s == "ffffff" ); +} + +int main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/42261.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/42261.cc new file mode 100644 index 00000000000..8782e8cafe9 --- /dev/null +++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/42261.cc @@ -0,0 +1,35 @@ +// Copyright (C) 2009 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include +#include + +// libstdc++/42261 +void test01() +{ + bool test __attribute__((unused)) = true; + using namespace std; + + const wstring s(wstring::size_type(6), wstring::size_type(L'f')); + VERIFY( s == L"ffffff" ); +} + +int main() +{ + test01(); + return 0; +}