1.1 --- a/epoc32/include/stdapis/stlport/config/stlcomp.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/stdapis/stlport/config/stlcomp.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -38,19 +38,23 @@
     1.4  #ifndef _STLP_COMP_H
     1.5  # define _STLP_COMP_H
     1.6  
     1.7 +#include <_ansi.h>
     1.8  #ifdef __SYMBIAN32__
     1.9 +/*
    1.10  #ifndef __NO_THROW
    1.11  #define __NO_THROW throw()
    1.12  #endif //__NO_THROW
    1.13  #ifndef NONSHARABLE_CLASS
    1.14  #define NONSHARABLE_CLASS(x) class x
    1.15  #endif
    1.16 -#   include <_ansi.h>
    1.17 +*/
    1.18  #else
    1.19  #   define EXPORT_C
    1.20  #   define IMPORT_C
    1.21  #endif
    1.22  
    1.23 +
    1.24 +
    1.25  #if 0
    1.26  #ifdef __SYMBIAN32__
    1.27  #warning __SYMBIAN32__
    1.28 @@ -127,19 +131,29 @@
    1.29   * Apple MPW MrCpp 4.1.0 */
    1.30  #  include <config/stl_apple.h>
    1.31  # elif defined(__SYMBIAN32__) && defined(EKA2) && defined (__GCCE__)
    1.32 -#  include <config/stl_gcce.h>
    1.33 +//#warning ***************USING GCCE COMPILER **************
    1.34 +#   include <config/stl_epoc.h>
    1.35 +#   include <config/_gcc.h>
    1.36 +#   include <config/stl_gcce.h>
    1.37 +//#  warning *****************************************
    1.38  # elif defined(__SYMBIAN32__) && defined(EKA2) && defined (__WINSCW__)
    1.39  /* Metrowerks CodeWarrior for Symbian EKA2 */
    1.40 -
    1.41  //#  warning ********** USING METROWERKS COMPILER **********
    1.42 +# include <config/stl_epoc.h>
    1.43  #  include <config/stl_winscw.h>
    1.44  //#  warning *****************************************
    1.45 -
    1.46  #elif defined (__SYMBIAN32__) && defined(EKA2) && defined(__ARMCC__)
    1.47  /* ARM RVCT for Symbian EKA2 */
    1.48  //#  warning ********** USING RVCT COMPILER **********
    1.49 +# include <config/stl_epoc.h>
    1.50  #  include <config/stl_rvct.h>
    1.51 -
    1.52 +//#  warning *****************************************
    1.53 +# elif defined(__SYMBIAN32__) && defined(EKA2) && defined (__GCCXML__)
    1.54 +//#warning ***************USING GCCXML COMPILER **************
    1.55 +#   include <config/stl_epoc.h>
    1.56 +#   include <config/_gcc.h>
    1.57 +#   include <config/stl_gccxml.h>
    1.58 +//#  warning *****************************************
    1.59  #elif defined (__SYMBIAN32__)
    1.60  
    1.61  /* NO-OP: This is just for the Symbian build process, to silence