[src/trunk]: src/external/gpl3/gcc/dist/libstdc++-v3/include/ext pull across ...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4acc0d92aedf
branches:  trunk
changeset: 766369:4acc0d92aedf
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Jun 21 06:22:06 2011 +0000

description:
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.

diffstat:

 external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r 26c3be920f26 -r 4acc0d92aedf external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h
--- a/external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h        Tue Jun 21 06:18:56 2011 +0000
+++ b/external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h        Tue Jun 21 06:22:06 2011 +0000
@@ -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(...)