diff -r e1b950c65cb4 -r 837f303aceeb epoc32/include/stdapis/stlportv5/stl/_abbrevs.h --- a/epoc32/include/stdapis/stlportv5/stl/_abbrevs.h Wed Mar 31 12:27:01 2010 +0100 +++ b/epoc32/include/stdapis/stlportv5/stl/_abbrevs.h Wed Mar 31 12:33:34 2010 +0100 @@ -1,12 +1,12 @@ /* * - * Copyright (c) 1999 + * Copyright (c) 1999 * Boris Fomitchev * * This material is provided "as is", with absolutely no warranty expressed * or implied. Any use is at your own risk. * - * Permission to use or copy this software for any purpose is hereby granted + * Permission to use or copy this software for any purpose is hereby granted * without fee, provided the above notices are retained on all copies. * Permission to modify the code and to distribute modified code is granted, * provided the above notices are retained, and a notice that the code was @@ -35,36 +35,43 @@ # define back_insert_iterator _bI__It # define front_insert_iterator _fI__It # define raw_storage_iterator _rS__It -# define _Const_traits _C_Tr -# define _Nonconst_traits _N_Tr +# define _Const_traits _C_Tr +# define _Const_Const_traits _CC_Tr +# define _Nonconst_traits _N_Tr +# define _Nonconst_Const_traits _NC_Tr // ugliness is intentional - to reduce conflicts probability -# define __malloc_alloc M__A -# define __node_alloc D__A -# define __new_alloc N__A -# define __debug_alloc G__A +# define __malloc_alloc M__A +# define __node_alloc D__A +# define __new_alloc N__A +# define __debug_alloc G__A +# define _STLP_alloc_proxy P__A -# define __deque_iterator _dQ__It -# define _Buf_traits _dQ__BTr +# define _Deque_iterator_base _Dq__ItB # define _Deque_iterator _Dq__It -# define _Select1st _S1st -# define _Select2nd _S2nd +# define _Select1st _S1st +# define _Select2nd _S2nd +# define __move_source __m_s +# define _Vector_nonconst_traits _V_nct -# define _Hashtable_iterator _hT__It -# define _Hashtable_const_iterator _hT__cIt -# define _Hashtable_node _hT__N -# define _Hashtable_base _hT__B -# define _Ht_iterator _Ht_It +# define _Ht_iterator _Ht_It -# define __list_iterator _L__It -# define __slist_iterator _SL__It +# define _List_node_base _L__NB +# define _List_iterator_base _L__ItB +# define _List_iterator _L__It + +# define _Slist_iterator_base _SL__ItB +# define _Slist_iterator _SL__It # define _Rb_tree_node_base _rbT__NB # define _Rb_tree_node _rbT__N -# define _Rb_base_iterator _rbTB__It # define _Rb_tree_base_iterator _rbT__It # define _Rb_tree_base _rbT__B +# if defined (__DMC__) && defined (_STLP_DEBUG) +# define _NonDbg_hashtable _Nd_Ht +# define _DBG_iter _d__It +# endif #endif