1.1 --- a/epoc32/include/stdapis/stlportv5/stl/config/features.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/stdapis/stlportv5/stl/config/features.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -32,8 +32,8 @@
     1.4   * Defines all STLport settings.
     1.5   * This file is actually a wrapper : it includes compiler-specific
     1.6   * settings from <config/stlcomp.h>
     1.7 - * and user-defined settings from <stl_user_config.h>.
     1.8 - * See <config/stl_mycomp.h> and <stl_user_config.h> for the description
     1.9 + * and user-defined settings from <config/user_config.h>.
    1.10 + * See <config/stl_mycomp.h> and <config/user_config.h> for the description
    1.11   * of those macros
    1.12   *
    1.13   */
    1.14 @@ -681,7 +681,7 @@
    1.15  
    1.16  /* boris : it was found out that _STLP_USE_SEPARATE_RELOPS_NAMESPACE
    1.17     causes less problems than having relational operator templates in global namespace
    1.18 -   Please define _STLP_NO_RELOPS_NAMESPACE in stl_user_config.h if your code rely on them. */
    1.19 +   Please define _STLP_NO_RELOPS_NAMESPACE in config/user_config.h if your code rely on them. */
    1.20  #  if !defined (_STLP_NO_RELOPS_NAMESPACE)
    1.21  #    define _STLP_USE_SEPARATE_RELOPS_NAMESPACE
    1.22  #  endif
    1.23 @@ -1093,10 +1093,7 @@
    1.24  #  ifndef _STLP_CLASS_IMPORT_DECLSPEC
    1.25  #    define _STLP_CLASS_IMPORT_DECLSPEC
    1.26  #  endif
    1.27 -#  if defined (_STLP_DESIGNATED_DLL) /* This is a lib which will contain STLport exports */
    1.28 -#    define  _STLP_DECLSPEC        _STLP_EXPORT_DECLSPEC
    1.29 -#    define  _STLP_CLASS_DECLSPEC  _STLP_CLASS_EXPORT_DECLSPEC
    1.30 -#  else
    1.31 +#  if !defined (_STLP_DESIGNATED_DLL) /* This is a lib which will contain STLport exports */
    1.32  #    define  _STLP_DECLSPEC        _STLP_IMPORT_DECLSPEC   /* Other modules, importing STLport exports */
    1.33  #    define  _STLP_CLASS_DECLSPEC  _STLP_CLASS_IMPORT_DECLSPEC
    1.34  #  endif
    1.35 @@ -1110,11 +1107,15 @@
    1.36  
    1.37  #define _STLP_EXPORT_TEMPLATE_CLASS _STLP_EXPORT template class _STLP_CLASS_DECLSPEC
    1.38  
    1.39 +//#ifndef __SYMBIAN32__
    1.40  #if defined (_STLP_MSVC) || defined (__ICL)
    1.41  #  define _STLP_STATIC_MEMBER_DECLSPEC
    1.42  #else
    1.43  #  define _STLP_STATIC_MEMBER_DECLSPEC _STLP_DECLSPEC
    1.44  #endif
    1.45 +//#else
    1.46 +//#  define _STLP_STATIC_MEMBER_DECLSPEC _STLP_IMPORT_DECLSPEC
    1.47 +//#endif
    1.48  
    1.49  #if !defined (_STLP_CALL)
    1.50  #  define _STLP_CALL