1.1 --- a/epoc32/include/tools/stlport/stl/config/_intel.h Wed Mar 31 12:27:01 2010 +0100
1.2 +++ b/epoc32/include/tools/stlport/stl/config/_intel.h Wed Mar 31 12:33:34 2010 +0100
1.3 @@ -1,66 +1,66 @@
1.4 -// STLport configuration file
1.5 -// It is internal STLport header - DO NOT include it directly
1.6 -
1.7 -#define _STLP_COMPILER "Intel ICL"
1.8 -
1.9 -#define _STLP_IMPORT_TEMPLATE_KEYWORD extern
1.10 -
1.11 -/* You need to undef following macro if your icl install is binded to MSVC 6
1.12 - * native lib and you are building with /Qvc7 or /Qvc7.1 or /Qvc8 option.
1.13 - */
1.14 -/* #define _STLP_MSVC_LIB 1200 */
1.15 -/* You need to undef following macro if your icl install is binded to MSVC .Net 2002
1.16 - * native lib and you are building without any /Qvc* option or with /Qvc6 or /Qvc7.1
1.17 - * or /Qvc8 option.
1.18 - */
1.19 -/* #define _STLP_MSVC_LIB 1300 */
1.20 -/* You need to undef following macro if your icl install is binded to MSVC .Net 2002
1.21 - * native lib and you are building without any /Qvc* option or with /Qvc6 or /Qvc7
1.22 - * or /Qvc8 option.
1.23 - */
1.24 -/* #define _STLP_MSVC_LIB 1310 */
1.25 -/* You need to undef following macro if your icl install is binded to MSVC .Net 2002
1.26 - * native lib and you are building without any /Qvc* option or with /Qvc6 or /Qvc7
1.27 - * or /Qvc7.1 option.
1.28 - */
1.29 -/* #define _STLP_MSVC_LIB 1400 */
1.30 -
1.31 -#include <stl/config/_msvc.h>
1.32 -
1.33 -#if defined (_STLP_DONT_RETURN_VOID)
1.34 -# undef _STLP_DONT_RETURN_VOID
1.35 -#endif
1.36 -
1.37 -#if (__ICL >= 900)
1.38 -//# undef _STLP_NO_UNEXPECTED_EXCEPT_SUPPORT
1.39 -# if !defined (_STLP_DONT_USE_EXCEPTIONS)
1.40 -# define _STLP_NOTHROW throw()
1.41 -# endif
1.42 -#endif
1.43 -
1.44 -#if (__ICL >= 800)
1.45 -# define _STLP_STATIC_CONST_INIT_BUG 1
1.46 -#endif
1.47 -
1.48 -#if (__ICL >= 450)
1.49 -# define _STLP_DLLEXPORT_NEEDS_PREDECLARATION 1
1.50 -#endif
1.51 -
1.52 -#if (__ICL < 450)
1.53 -/* only static STLport lib works for ICL */
1.54 -# undef _STLP_USE_STATIC_LIB
1.55 -# undef _STLP_USE_DYNAMIC_LIB
1.56 -# define _STLP_USE_STATIC_LIB
1.57 -/* disable hook which makes template symbols to be searched for in the library */
1.58 -# undef _STLP_NO_CUSTOM_IO
1.59 -#endif
1.60 -
1.61 -#undef _STLP_LONG_LONG
1.62 -#define _STLP_LONG_LONG long long
1.63 -
1.64 -#if defined (__cplusplus) && (__ICL >= 900) && (_STLP_MSVC_LIB < 1300)
1.65 -namespace std
1.66 -{
1.67 - void _STLP_CALL unexpected();
1.68 -}
1.69 -#endif
1.70 +// STLport configuration file
1.71 +// It is internal STLport header - DO NOT include it directly
1.72 +
1.73 +#define _STLP_COMPILER "Intel ICL"
1.74 +
1.75 +#define _STLP_IMPORT_TEMPLATE_KEYWORD extern
1.76 +
1.77 +/* You need to undef following macro if your icl install is binded to MSVC 6
1.78 + * native lib and you are building with /Qvc7 or /Qvc7.1 or /Qvc8 option.
1.79 + */
1.80 +/* #define _STLP_MSVC_LIB 1200 */
1.81 +/* You need to undef following macro if your icl install is binded to MSVC .Net 2002
1.82 + * native lib and you are building without any /Qvc* option or with /Qvc6 or /Qvc7.1
1.83 + * or /Qvc8 option.
1.84 + */
1.85 +/* #define _STLP_MSVC_LIB 1300 */
1.86 +/* You need to undef following macro if your icl install is binded to MSVC .Net 2002
1.87 + * native lib and you are building without any /Qvc* option or with /Qvc6 or /Qvc7
1.88 + * or /Qvc8 option.
1.89 + */
1.90 +/* #define _STLP_MSVC_LIB 1310 */
1.91 +/* You need to undef following macro if your icl install is binded to MSVC .Net 2002
1.92 + * native lib and you are building without any /Qvc* option or with /Qvc6 or /Qvc7
1.93 + * or /Qvc7.1 option.
1.94 + */
1.95 +/* #define _STLP_MSVC_LIB 1400 */
1.96 +
1.97 +#include <stl/config/_msvc.h>
1.98 +
1.99 +#if defined (_STLP_DONT_RETURN_VOID)
1.100 +# undef _STLP_DONT_RETURN_VOID
1.101 +#endif
1.102 +
1.103 +#if (__ICL >= 900)
1.104 +//# undef _STLP_NO_UNEXPECTED_EXCEPT_SUPPORT
1.105 +# if !defined (_STLP_DONT_USE_EXCEPTIONS)
1.106 +# define _STLP_NOTHROW throw()
1.107 +# endif
1.108 +#endif
1.109 +
1.110 +#if (__ICL >= 800)
1.111 +# define _STLP_STATIC_CONST_INIT_BUG 1
1.112 +#endif
1.113 +
1.114 +#if (__ICL >= 450)
1.115 +# define _STLP_DLLEXPORT_NEEDS_PREDECLARATION 1
1.116 +#endif
1.117 +
1.118 +#if (__ICL < 450)
1.119 +/* only static STLport lib works for ICL */
1.120 +# undef _STLP_USE_STATIC_LIB
1.121 +# undef _STLP_USE_DYNAMIC_LIB
1.122 +# define _STLP_USE_STATIC_LIB
1.123 +/* disable hook which makes template symbols to be searched for in the library */
1.124 +# undef _STLP_NO_CUSTOM_IO
1.125 +#endif
1.126 +
1.127 +#undef _STLP_LONG_LONG
1.128 +#define _STLP_LONG_LONG long long
1.129 +
1.130 +#if defined (__cplusplus) && (__ICL >= 900) && (_STLP_MSVC_LIB < 1300)
1.131 +namespace std
1.132 +{
1.133 + void _STLP_CALL unexpected();
1.134 +}
1.135 +#endif