diff -r e1b950c65cb4 -r 837f303aceeb epoc32/include/stdapis/stlportv5/stl/_config_compat_post.h --- a/epoc32/include/stdapis/stlportv5/stl/_config_compat_post.h Wed Mar 31 12:27:01 2010 +0100 +++ b/epoc32/include/stdapis/stlportv5/stl/_config_compat_post.h Wed Mar 31 12:33:34 2010 +0100 @@ -1,4 +1,5 @@ -//========================================== +/*========================================== */ +#ifdef _STLP_3_COMPATIBILITY # define __SGI_STL_PORT _STLPORT_VERSION @@ -7,25 +8,22 @@ # endif # if defined (_STLP_USE_NAMESPACES) -# undef __STL_USE_NAMESPACES +# undef __STL_USE_NAMESPACES # define __STL_USE_NAMESPACES _STLP_USE_NAMESPACES # endif # if defined (_STLP_USE_EXCEPTIONS) -# undef __STL_USE_EXCEPTIONS +# undef __STL_USE_EXCEPTIONS # define __STL_USE_EXCEPTIONS _STLP_USE_EXCEPTIONS # endif -# if defined (_STLP_USE_NEW_IOSTREAMS) && ! defined ( __STL_USE_NEW_IOSTREAMS ) -# define __STL_USE_NEW_IOSTREAMS _STLP_USE_NEW_IOSTREAMS -# endif - # if defined (_STLP_BEGIN_NAMESPACE) && ! defined ( __STL_BEGIN_NAMESPACE ) # define __STL_BEGIN_NAMESPACE _STLP_BEGIN_NAMESPACE # define __STL_END_NAMESPACE _STLP_END_NAMESPACE # define __STL_VENDOR_STD _STLP_VENDOR_STD # define __STL_VENDOR_CSTD _STLP_VENDOR_CSTD # endif +# endif /* # if defined (_STLP_XXX) && ! defined ( __STL_XXX ) @@ -33,3 +31,25 @@ # endif */ +/* 5.0 -> 4.6 compatibility section */ +#ifdef _STLP_46_COMPATIBILITY + +#ifndef _STLP_USING_NAMESPACE_BUG +# define _STLP_USING_NAMESPACE_BUG +#endif + +/* provide a uniform way to access full funclionality */ +# define __slist__ slist +# define __map__ map +# define __multimap__ multimap +# define __set__ set +# define __multiset__ multiset +# define __list__ list +# define __hash_map__ hash_map +# define __hash_multimap__ hash_multimap +# define __hash_set__ hash_set +# define __hash_multiset__ hash_multiset +# define __vector__ vector + +#endif +