Module Name: src
Committed By: joerg
Date: Sat Feb 5 00:37:40 UTC 2011
Modified Files:
src/gnu/dist/gcc4/libstdc++-v3/include/ext: ropeimpl.h
Log Message:
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/gnu/dist/gcc4/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/gnu/dist/gcc4/libstdc++-v3/include/ext/ropeimpl.h
diff -u src/gnu/dist/gcc4/libstdc++-v3/include/ext/ropeimpl.h:1.1.1.1 src/gnu/dist/gcc4/libstdc++-v3/include/ext/ropeimpl.h:1.2
--- src/gnu/dist/gcc4/libstdc++-v3/include/ext/ropeimpl.h:1.1.1.1 Thu Apr 20 10:03:52 2006
+++ src/gnu/dist/gcc4/libstdc++-v3/include/ext/ropeimpl.h Sat Feb 5 00:37:40 2011
@@ -432,7 +432,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);
@@ -817,7 +817,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(...)
