1.1 --- a/epoc32/include/stdapis/stlportv5/stl/_config_compat_post.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/stdapis/stlportv5/stl/_config_compat_post.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,4 +1,5 @@
     1.4 -//==========================================
     1.5 +/*========================================== */
     1.6 +#ifdef _STLP_3_COMPATIBILITY
     1.7  
     1.8  # define __SGI_STL_PORT  _STLPORT_VERSION
     1.9  
    1.10 @@ -7,25 +8,22 @@
    1.11  # endif
    1.12  
    1.13  # if defined (_STLP_USE_NAMESPACES)
    1.14 -#  undef  __STL_USE_NAMESPACES 
    1.15 +#  undef  __STL_USE_NAMESPACES
    1.16  #  define __STL_USE_NAMESPACES _STLP_USE_NAMESPACES
    1.17  # endif
    1.18  
    1.19  # if defined (_STLP_USE_EXCEPTIONS)
    1.20 -#  undef  __STL_USE_EXCEPTIONS 
    1.21 +#  undef  __STL_USE_EXCEPTIONS
    1.22  #  define __STL_USE_EXCEPTIONS _STLP_USE_EXCEPTIONS
    1.23  # endif
    1.24  
    1.25 -# if defined (_STLP_USE_NEW_IOSTREAMS) && ! defined ( __STL_USE_NEW_IOSTREAMS )
    1.26 -#  define __STL_USE_NEW_IOSTREAMS _STLP_USE_NEW_IOSTREAMS
    1.27 -# endif
    1.28 -
    1.29  # if defined (_STLP_BEGIN_NAMESPACE) && ! defined ( __STL_BEGIN_NAMESPACE )
    1.30  #  define __STL_BEGIN_NAMESPACE _STLP_BEGIN_NAMESPACE
    1.31  #  define __STL_END_NAMESPACE _STLP_END_NAMESPACE
    1.32  #  define __STL_VENDOR_STD _STLP_VENDOR_STD
    1.33  #  define __STL_VENDOR_CSTD _STLP_VENDOR_CSTD
    1.34  # endif
    1.35 +# endif
    1.36  
    1.37  /*
    1.38  # if defined (_STLP_XXX) && ! defined ( __STL_XXX )
    1.39 @@ -33,3 +31,25 @@
    1.40  # endif
    1.41  */
    1.42  
    1.43 +/* 5.0 -> 4.6 compatibility section */
    1.44 +#ifdef _STLP_46_COMPATIBILITY
    1.45 +
    1.46 +#ifndef  _STLP_USING_NAMESPACE_BUG
    1.47 +# define _STLP_USING_NAMESPACE_BUG
    1.48 +#endif
    1.49 +
    1.50 +/* provide a uniform way to access full funclionality */
    1.51 +# define __slist__         slist
    1.52 +# define __map__           map
    1.53 +# define __multimap__      multimap
    1.54 +# define __set__           set
    1.55 +# define __multiset__      multiset
    1.56 +# define __list__          list
    1.57 +# define __hash_map__      hash_map
    1.58 +# define __hash_multimap__ hash_multimap
    1.59 +# define __hash_set__      hash_set
    1.60 +# define __hash_multiset__ hash_multiset
    1.61 +# define __vector__        vector
    1.62 +
    1.63 +#endif
    1.64 +