[src/trunk]: src Fix template lookup.

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

details:   https://anonhg.NetBSD.org/src/rev/7861a5036921
branches:  trunk
changeset: 785201:7861a5036921
user:      joerg <joerg%NetBSD.org@localhost>
date:      Sat Mar 02 23:23:55 2013 +0000

description:
Fix template lookup.

diffstat:

 external/gpl3/gcc/dist/libstdc++-v3/include/ext/rope       |   4 ++--
 external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h |  10 +++++-----
 gnu/dist/gcc4/libstdc++-v3/include/ext/rope                |   4 ++--
 gnu/dist/gcc4/libstdc++-v3/include/ext/ropeimpl.h          |  10 +++++-----
 4 files changed, 14 insertions(+), 14 deletions(-)

diffs (138 lines):

diff -r 0fd595026953 -r 7861a5036921 external/gpl3/gcc/dist/libstdc++-v3/include/ext/rope
--- a/external/gpl3/gcc/dist/libstdc++-v3/include/ext/rope      Sat Mar 02 22:04:06 2013 +0000
+++ b/external/gpl3/gcc/dist/libstdc++-v3/include/ext/rope      Sat Mar 02 23:23:55 2013 +0000
@@ -727,7 +727,7 @@
         if (_M_data != this->_M_c_string)
          this->_M_free_c_string();
        
-        __STL_FREE_STRING(_M_data, this->_M_size, this->_M_get_allocator());
+        this->__STL_FREE_STRING(_M_data, this->_M_size, this->_M_get_allocator());
       }
 #endif
 protected:
@@ -1168,7 +1168,7 @@
       operator*()
       {
         if (0 == this->_M_buf_ptr)
-         _S_setcache(*this);
+         this->_S_setcache(*this);
         return *this->_M_buf_ptr;
       }
 
diff -r 0fd595026953 -r 7861a5036921 external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h
--- a/external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h        Sat Mar 02 22:04:06 2013 +0000
+++ b/external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h        Sat Mar 02 23:23:55 2013 +0000
@@ -378,7 +378,7 @@
            _Rope_RopeLeaf<_CharT, _Alloc>* __l
              = (_Rope_RopeLeaf<_CharT, _Alloc>*)this;
            __l->_Rope_RopeLeaf<_CharT, _Alloc>::~_Rope_RopeLeaf();
-           _L_deallocate(__l, 1);
+           this->_L_deallocate(__l, 1);
            break;
          }
        case __detail::_S_concat:
@@ -387,7 +387,7 @@
              = (_Rope_RopeConcatenation<_CharT, _Alloc>*)this;
            __c->_Rope_RopeConcatenation<_CharT, _Alloc>::
              ~_Rope_RopeConcatenation();
-           _C_deallocate(__c, 1);
+           this->_C_deallocate(__c, 1);
            break;
          }
        case __detail::_S_function:
@@ -395,7 +395,7 @@
            _Rope_RopeFunction<_CharT, _Alloc>* __f
              = (_Rope_RopeFunction<_CharT, _Alloc>*)this;
            __f->_Rope_RopeFunction<_CharT, _Alloc>::~_Rope_RopeFunction();
-           _F_deallocate(__f, 1);
+           this->_F_deallocate(__f, 1);
            break;
          }
        case __detail::_S_substringfn:
@@ -404,7 +404,7 @@
              (_Rope_RopeSubstring<_CharT, _Alloc>*)this;
            __ss->_Rope_RopeSubstring<_CharT, _Alloc>::
              ~_Rope_RopeSubstring();
-           _S_deallocate(__ss, 1);
+           this->_S_deallocate(__ss, 1);
            break;
          }
        }
@@ -509,7 +509,7 @@
            }
          __catch(...)
            {
-             _C_deallocate(__result,1);
+             rope::_C_deallocate(__result,1);
              __throw_exception_again;
            }
          // In case of exception, we need to deallocate
diff -r 0fd595026953 -r 7861a5036921 gnu/dist/gcc4/libstdc++-v3/include/ext/rope
--- a/gnu/dist/gcc4/libstdc++-v3/include/ext/rope       Sat Mar 02 22:04:06 2013 +0000
+++ b/gnu/dist/gcc4/libstdc++-v3/include/ext/rope       Sat Mar 02 23:23:55 2013 +0000
@@ -708,7 +708,7 @@
         if (_M_data != this->_M_c_string)
          this->_M_free_c_string();
        
-        __STL_FREE_STRING(_M_data, this->_M_size, this->get_allocator());
+        this->__STL_FREE_STRING(_M_data, this->_M_size, this->get_allocator());
       }
 #endif
 protected:
@@ -1150,7 +1150,7 @@
       operator*()
       {
         if (0 == this->_M_buf_ptr)
-         _S_setcache(*this);
+         this->_S_setcache(*this);
         return *this->_M_buf_ptr;
       }
       
diff -r 0fd595026953 -r 7861a5036921 gnu/dist/gcc4/libstdc++-v3/include/ext/ropeimpl.h
--- a/gnu/dist/gcc4/libstdc++-v3/include/ext/ropeimpl.h Sat Mar 02 22:04:06 2013 +0000
+++ b/gnu/dist/gcc4/libstdc++-v3/include/ext/ropeimpl.h Sat Mar 02 23:23:55 2013 +0000
@@ -382,7 +382,7 @@
            _Rope_RopeLeaf<_CharT, _Alloc>* __l
              = (_Rope_RopeLeaf<_CharT, _Alloc>*)this;
            __l->_Rope_RopeLeaf<_CharT, _Alloc>::~_Rope_RopeLeaf();
-           _L_deallocate(__l, 1);
+           this->_L_deallocate(__l, 1);
            break;
          }
        case _Rope_constants::_S_concat:
@@ -391,7 +391,7 @@
              = (_Rope_RopeConcatenation<_CharT, _Alloc>*)this;
            __c->_Rope_RopeConcatenation<_CharT, _Alloc>::
              ~_Rope_RopeConcatenation();
-           _C_deallocate(__c, 1);
+           this->_C_deallocate(__c, 1);
            break;
          }
        case _Rope_constants::_S_function:
@@ -399,7 +399,7 @@
            _Rope_RopeFunction<_CharT, _Alloc>* __f
              = (_Rope_RopeFunction<_CharT, _Alloc>*)this;
            __f->_Rope_RopeFunction<_CharT, _Alloc>::~_Rope_RopeFunction();
-           _F_deallocate(__f, 1);
+           this->_F_deallocate(__f, 1);
            break;
          }
        case _Rope_constants::_S_substringfn:
@@ -408,7 +408,7 @@
              (_Rope_RopeSubstring<_CharT, _Alloc>*)this;
            __ss->_Rope_RopeSubstring<_CharT, _Alloc>::
              ~_Rope_RopeSubstring();
-           _S_deallocate(__ss, 1);
+           this->_S_deallocate(__ss, 1);
            break;
          }
        }
@@ -513,7 +513,7 @@
            }
          catch(...)
            {
-             _C_deallocate(__result,1);
+             rope::_C_deallocate(__result,1);
              __throw_exception_again;
            }
          // In case of exception, we need to deallocate