Module Name: src
Committed By: mrg
Date: Tue Jun 21 06:22:06 UTC 2011
Modified Files:
src/external/gpl3/gcc/dist/libstdc++-v3/include/ext: ropeimpl.h
Log Message:
pull across from gcc 4.1:
revision 1.2
date: 2011/02/05 00:37:40; author: joerg; state: Exp; lines: +2 -2
Explicitly use template to allow building with the more strict
template lookup in clang. From FreeBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h
diff -u src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h:1.1.1.1 src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h:1.2
--- src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h:1.1.1.1 Tue Jun 21 01:24:44 2011
+++ src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h Tue Jun 21 06:22:06 2011
@@ -428,7 +428,7 @@
{
size_t __old_len = __r->_M_size;
_CharT* __new_data = (_CharT*)
- _Data_allocate(_S_rounded_up_size(__old_len + __len));
+ _Rope_rep_base<_CharT, _Alloc>::_Data_allocate(_S_rounded_up_size(__old_len + __len));
_RopeLeaf* __result;
uninitialized_copy_n(__r->_M_data, __old_len, __new_data);
@@ -812,7 +812,7 @@
if (__result_len > __lazy_threshold)
goto lazy;
__section = (_CharT*)
- _Data_allocate(_S_rounded_up_size(__result_len));
+ _Rope_rep_base<_CharT, _Alloc>::_Data_allocate(_S_rounded_up_size(__result_len));
__try
{ (*(__f->_M_fn))(__start, __result_len, __section); }
__catch(...)
