git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR libstdc++/61946 (rope construction, passing allocator referenct without const) 

PR libstdc++/61946
	* include/ext/rope (rope::rope(char_producer<_CharT>*, size_t, bool,
	const allocator_type&)): Pass non-const allocator to
	_S_new_RopeFunction.
	* testsuite/ext/rope/61946.cc: New.

From-SVN: r213220
This commit is contained in:
Jonathan Wakely 2014-07-29 18:30:25 +01:00 committed by Jonathan Wakely
parent 212c47b4de
commit aec20dcf39
3 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,11 @@
2014-07-29 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/61946
* include/ext/rope (rope::rope(char_producer<_CharT>*, size_t, bool,
const allocator_type&)): Pass non-const allocator to
_S_new_RopeFunction.
* testsuite/ext/rope/61946.cc: New.
2014-07-29 Ed Smith-Rowland <3dw4rd@verizon.net> 2014-07-29 Ed Smith-Rowland <3dw4rd@verizon.net>
PR libstdc++/60037 - SIGFPE in std::generate_canonical<unsigned int...> PR libstdc++/60037 - SIGFPE in std::generate_canonical<unsigned int...>

7
libstdc++-v3/include/ext/rope
View File

@ -1544,7 +1544,7 @@ protected:
typedef typename _Base::allocator_type allocator_type; typedef typename _Base::allocator_type allocator_type;
using _Base::_M_tree_ptr; using _Base::_M_tree_ptr;
using _Base::get_allocator; using _Base::get_allocator;
using _Base::_M_get_allocator; using _Base::_M_get_allocator;
typedef __GC_CONST _CharT* _Cstrptr; typedef __GC_CONST _CharT* _Cstrptr;
static _CharT _S_empty_c_str[1]; static _CharT _S_empty_c_str[1];
@ -1876,8 +1876,9 @@ protected:
const allocator_type& __a = allocator_type()) const allocator_type& __a = allocator_type())
: _Base(__a) : _Base(__a)
{ {
this->_M_tree_ptr = (0 == __len) ? this->_M_tree_ptr = (0 == __len)
0 : _S_new_RopeFunction(__fn, __len, __delete_fn, __a); ? 0
: _S_new_RopeFunction(__fn, __len, __delete_fn, _M_get_allocator());
} }
rope(const rope& __x, const allocator_type& __a = allocator_type()) rope(const rope& __x, const allocator_type& __a = allocator_type())

31
libstdc++-v3/testsuite/ext/rope/61946.cc Normal file
View File

@ -0,0 +1,31 @@
// Copyright (C) 2014 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
// <http://www.gnu.org/licenses/>.
// { dg-do compile }
#include <ext/rope>
struct empty_char_prod : __gnu_cxx::char_producer<char>
{
virtual void operator()(size_t, size_t, char*) {}
};
int main ()
{
empty_char_prod* ecp = new empty_char_prod;
__gnu_cxx::crope excrope( ecp, 10L, true );
}