1.1 --- a/epoc32/include/stdapis/stlportv5/stl/_abbrevs.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/stdapis/stlportv5/stl/_abbrevs.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,12 +1,12 @@
     1.4  /*
     1.5   *
     1.6 - * Copyright (c) 1999 
     1.7 + * Copyright (c) 1999
     1.8   * Boris Fomitchev
     1.9   *
    1.10   * This material is provided "as is", with absolutely no warranty expressed
    1.11   * or implied. Any use is at your own risk.
    1.12   *
    1.13 - * Permission to use or copy this software for any purpose is hereby granted 
    1.14 + * Permission to use or copy this software for any purpose is hereby granted
    1.15   * without fee, provided the above notices are retained on all copies.
    1.16   * Permission to modify the code and to distribute modified code is granted,
    1.17   * provided the above notices are retained, and a notice that the code was
    1.18 @@ -35,36 +35,43 @@
    1.19  #  define back_insert_iterator           _bI__It
    1.20  #  define front_insert_iterator          _fI__It
    1.21  #  define raw_storage_iterator           _rS__It
    1.22 -#  define _Const_traits _C_Tr
    1.23 -#  define _Nonconst_traits _N_Tr
    1.24 +#  define _Const_traits                  _C_Tr
    1.25 +#  define _Const_Const_traits            _CC_Tr
    1.26 +#  define _Nonconst_traits               _N_Tr
    1.27 +#  define _Nonconst_Const_traits         _NC_Tr
    1.28  
    1.29  // ugliness is intentional - to reduce conflicts probability
    1.30 -#  define __malloc_alloc   M__A
    1.31 -#  define __node_alloc     D__A
    1.32 -#  define __new_alloc      N__A
    1.33 -#  define __debug_alloc    G__A
    1.34 +#  define __malloc_alloc    M__A
    1.35 +#  define __node_alloc      D__A
    1.36 +#  define __new_alloc       N__A
    1.37 +#  define __debug_alloc     G__A
    1.38 +#  define _STLP_alloc_proxy P__A
    1.39  
    1.40 -#  define __deque_iterator         _dQ__It
    1.41 -#  define _Buf_traits              _dQ__BTr
    1.42 +#  define _Deque_iterator_base     _Dq__ItB
    1.43  #  define _Deque_iterator          _Dq__It
    1.44  
    1.45 -#  define _Select1st _S1st
    1.46 -#  define _Select2nd _S2nd
    1.47 +#  define _Select1st                  _S1st
    1.48 +#  define _Select2nd                  _S2nd
    1.49 +#  define __move_source               __m_s
    1.50 +#  define _Vector_nonconst_traits     _V_nct
    1.51  
    1.52 -#  define _Hashtable_iterator         _hT__It
    1.53 -#  define _Hashtable_const_iterator   _hT__cIt
    1.54 -#  define _Hashtable_node             _hT__N
    1.55 -#  define _Hashtable_base             _hT__B
    1.56 -#  define _Ht_iterator _Ht_It
    1.57 +#  define _Ht_iterator                _Ht_It
    1.58  
    1.59 -#  define __list_iterator         _L__It
    1.60 -#  define __slist_iterator         _SL__It
    1.61 +#  define _List_node_base          _L__NB
    1.62 +#  define _List_iterator_base      _L__ItB
    1.63 +#  define _List_iterator           _L__It
    1.64 +
    1.65 +#  define _Slist_iterator_base     _SL__ItB
    1.66 +#  define _Slist_iterator          _SL__It
    1.67  
    1.68  #  define _Rb_tree_node_base       _rbT__NB
    1.69  #  define _Rb_tree_node            _rbT__N
    1.70 -#  define _Rb_base_iterator        _rbTB__It
    1.71  #  define _Rb_tree_base_iterator   _rbT__It
    1.72  #  define _Rb_tree_base            _rbT__B
    1.73  
    1.74 +#  if defined (__DMC__) && defined (_STLP_DEBUG)
    1.75 +#    define _NonDbg_hashtable      _Nd_Ht
    1.76 +#    define _DBG_iter              _d__It
    1.77 +#  endif
    1.78  #endif
    1.79