1.1 --- a/epoc32/include/stdapis/stlport/config/stl_epoc.h Wed Mar 31 12:27:01 2010 +0100
1.2 +++ b/epoc32/include/stdapis/stlport/config/stl_epoc.h Wed Mar 31 12:33:34 2010 +0100
1.3 @@ -32,14 +32,6 @@
1.4 # ifndef _STLP_EPOC_H
1.5 # define _STLP_EPOC_H
1.6
1.7 -// NON-STANDARD!!!!
1.8 -
1.9 -#if defined(__WINS__)
1.10 -# pragma warning ( disable : 4018 4097 4100 4127 4244 4284 4511 4512 4514 4786 4800 ) //4355 4284 4231 4511 4512 4097 4786 4800 4018 4146 4244 4514 4127 4100 4663)
1.11 -# define _STLP_NO_FUNCTION_TMPL_PARTIAL_ORDER 1
1.12 -// Uncomment if partial order of template functions is not available
1.13 -# define _STLP_NO_FUNC_PARTIAL_ORDERING 1
1.14 -#endif
1.15 /*
1.16 #ifndef _STLP_NO_IOSTREAMS
1.17 # define _STLP_NO_IOSTREAMS 1
1.18 @@ -50,12 +42,6 @@
1.19 //# define _NOTHREADS 1
1.20 # define _STLP_NO_TYPEINFO 1
1.21 */
1.22 -#ifndef __PLACEMENT_NEW_INLINE
1.23 -#ifndef __E32STD_H__
1.24 -inline void * operator new(unsigned int, void *_P) { return (_P); }
1.25 -#define __PLACEMENT_NEW_INLINE
1.26 -#endif // E32STD_H
1.27 -#endif
1.28
1.29 //==========================================================
1.30
1.31 @@ -64,28 +50,28 @@
1.32
1.33 // Mostly correct guess, change it for Alpha (and other environments
1.34 // that has 64-bit "long")
1.35 -# define _STLP_UINT32_T unsigned long
1.36 +# define _STLP_UINT32_T unsigned long
1.37
1.38 // Disables wchar_t functinality
1.39 -# define _STLP_NO_WCHAR_T 1
1.40 +//# define _STLP_NO_WCHAR_T 1
1.41
1.42 // Define if wchar_t is not a unique type, and is actually a typedef to unsigned short.
1.43 // # define _STLP_WCHAR_T_IS_USHORT 1
1.44
1.45 // Uncomment if long long is available
1.46 -// # define _STLP_LONG_LONG long long
1.47 +# define _STLP_LONG_LONG long long
1.48
1.49 // Uncomment if long double is not available
1.50 // # define _STLP_NO_LONG_DOUBLE 1
1.51
1.52 // Uncomment this if your compiler does not support namespaces
1.53 -# define _STLP_HAS_NO_NAMESPACES 1
1.54 +//# define _STLP_HAS_NO_NAMESPACES 1
1.55
1.56 // Uncomment if "using" keyword does not work with template types
1.57 // # define _STLP_BROKEN_USING_DIRECTIVE 1
1.58
1.59 // Uncomment this if your compiler does not support exceptions
1.60 -# define _STLP_HAS_NO_EXCEPTIONS 1
1.61 +//# define _STLP_HAS_NO_EXCEPTIONS 1
1.62
1.63 // Header <new> that comes with the compiler
1.64 // does not define bad_alloc exception
1.65 @@ -97,11 +83,6 @@
1.66 // Uncomment if member template methods are not available
1.67 // # define _STLP_NO_MEMBER_TEMPLATES 1
1.68
1.69 -// Uncomment if member template classes are not available
1.70 -#if defined(__WINS__)
1.71 -# define _STLP_NO_MEMBER_TEMPLATE_CLASSES 1
1.72 -#endif
1.73 -
1.74 // Uncomment if friend member templates are not available
1.75 #if defined(__WINS__)
1.76 // Possibly required ???
1.77 @@ -111,10 +92,6 @@
1.78 // Compiler does not accept friend declaration qualified with namespace name.
1.79 // # define _STLP_NO_QUALIFIED_FRIENDS 1
1.80
1.81 -// Uncomment if partial specialization is not available
1.82 -#if defined(__WINS__)
1.83 -# define _STLP_NO_CLASS_PARTIAL_SPECIALIZATION 1
1.84 -#endif
1.85
1.86 // Define if class being partially specialized require full name (template parameters)
1.87 // of itself for method declarations
1.88 @@ -163,9 +140,31 @@
1.89 // compiler headers included. Default is "../include".
1.90 // C headers may reside in different directory, so separate macro is provided.
1.91 // Hint : never install STLport in the directory that ends with "include"
1.92 -// # define _STLP_NATIVE_INCLUDE_PATH ../include
1.93 -# define _STLP_NATIVE_C_INCLUDE_PATH libc
1.94 -# define _STLP_NATIVE_INCLUDE_PATH libc
1.95 +
1.96 +# define _STLP_NATIVE_C_INCLUDE_PATH stdapis/
1.97 +# define _STLP_NATIVE_INCLUDE_PATH
1.98 +#define _STLP_NATIVE_CPP_RUNTIME_INCLUDE_PATH runtime/
1.99 +
1.100 +// These are some options that are common across compilers used in Symbian
1.101 +# define _STLP_NO_NEW_NEW_HEADER 1
1.102 +# define _STLP_NO_NEW_HEADER
1.103 +# define _STLP_USE_DECLSPEC
1.104 +# undef _STLP_EXPORT_DECLSPEC
1.105 +# undef _STLP_IMPORT_DECLSPEC
1.106 +# define _STLP_NO_THREADS
1.107 +# define _STLP_USE_NEW_IOSTREAMS
1.108 +# define _STLP_NO_OWN_IOSTREAMS
1.109 +# define _STLP_USE_NEWALLOC
1.110 +# define _STLP_NO_LONG_DOUBLE
1.111 +# define _STLP_LITTLE_ENDIAN
1.112 +# define _STLP_LABS
1.113 +# define _STLP_LDIV
1.114 +# define _STLP_CONST_CONSTRUCTOR_BUG
1.115 +# define _STLP_COMPLEX_SPECIALIZATION_BUG
1.116 +# define _STLP_USE_EXCEPTIONS
1.117 +# define _STLP_EXTERN_RANGE_ERRORS
1.118 +// Defined in _site_config.h
1.119 +//# define _STLP_NO_OWN_NAMESPACE
1.120
1.121 //==========================================================
1.122 # endif