diff -r e1b950c65cb4 -r 837f303aceeb epoc32/include/stdapis/stlportv5/stl/config/stl_winscw.h
--- a/epoc32/include/stdapis/stlportv5/stl/config/stl_winscw.h Wed Mar 31 12:27:01 2010 +0100
+++ b/epoc32/include/stdapis/stlportv5/stl/config/stl_winscw.h Wed Mar 31 12:33:34 2010 +0100
@@ -1,236 +1,41 @@
/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
-
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-* list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice,
-* this list of conditions and the following disclaimer in the documentation
-* and/or other materials provided with the distribution.
-* Neither the name of Nokia Corporation nor the names of its contributors
-* may be used to endorse or promote products derived from this software
-* without specific prior written permission.
-
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
*
* Description:
+* Name : stl_winscw.h
+* Part of : standard c++ library. (config file)
+*
*
*/
-
-// =============================================================================
-// stl_winscw.h
-// This is a list of settings for STLport specific to the Metrowerks
-// CodeWarrior for Symbian compiler. Do not include this file directly.
-// =============================================================================
-#ifndef _STLP_WINSCW
-# define _STLP_WINSCW
-// -----------------------------------------------------------------------------
-// iostreams
-// No support for these in Symbian.
-// -----------------------------------------------------------------------------
-/*
-# ifndef _STLP_NO_IOSTREAMS
-# define _STLP_NO_IOSTREAMS
-# endif
-# ifdef _STLP_OWN_IOSTREAMS
-# undef _STLP_OWN_IOSTREAMS
-# endif
-*/
-//# define _STLP_NO_NATIVE_MBSTATE_T 1
-//# define _NOTHREADS 1
-//# define _STLP_NO_TYPEINFO 1
+#ifndef _STL_WINSCW_H_
+#define _STL_WINSCW_H_
+#ifdef __MWERKS__
+# include <stl/config/_mwerks.h>
+#else
+//This is required to satisfy the C preprocessor run by ABLD.
+# define _STLP_COMPILER "Metrowerks Codewarrior"
+# define _STLP_LITTLE_ENDIAN
-# ifndef __PLACEMENT_NEW_INLINE
-# ifndef __E32STD_H__
-# ifdef __cplusplus
- inline void * operator new(unsigned int, void *_P) throw(){ return (_P); }
- inline void operator delete(void* /*aPtr*/, void* /*aBase*/) __NO_THROW {}
-# endif
-# define __PLACEMENT_NEW_INLINE
-# endif // E32STD_H
-# endif
+#ifdef __CW32__
+ #define _M_IX86
+#endif
+#endif //__MWERKS__
-//# undef _STLP_OWN_IOSTREAMS
-//#define _STLP_OWN_IOSTREAMS
-#define _STLP_USE_NEW_IOSTREAMS
+#define __SYMBIAN32__WSD__
-//==========================================================
-
-// the values choosen here as defaults try to give
-// maximum functionality on the most conservative settings
-
-// Mostly correct guess, change it for Alpha (and other environments
-// that has 64-bit "long")
-# define _STLP_UINT32_T unsigned long
-
-
-// Define if wchar_t is not a unique type, and is actually a typedef to unsigned short.
-// # define _STLP_WCHAR_T_IS_USHORT 1
-
-// Uncomment if long long is available
-# define _STLP_LONG_LONG long long
-
-// Uncomment if long double is not available
-// # define _STLP_NO_LONG_DOUBLE 1
-
-// Uncomment this if your compiler does not support namespaces
-//# define _STLP_HAS_NO_NAMESPACES 1
-
-// Uncomment if "using" keyword does not work with template types
-// # define _STLP_BROKEN_USING_DIRECTIVE 1
-
-// Uncomment this if your compiler does not support exceptions
-//# define _STLP_HAS_NO_EXCEPTIONS 1
-//# define _STLP_USE_TRAP_LEAVE 1
-
-// Header <new> that comes with the compiler
-// does not define bad_alloc exception
-//# if defined(__WINS__)
-// Possibly required ???
-# define _STLP_NO_BAD_ALLOC 1
-//# endif
-
-// Uncomment if member template methods are not available
-// # define _STLP_NO_MEMBER_TEMPLATES 1
-
-// Uncomment if member template classes are not available
-# if defined(__WINS__)
-//# define _STLP_NO_MEMBER_TEMPLATE_CLASSES 1
-# endif
-
-// Uncomment if friend member templates are not available
-#if defined(__WINS__)
-// Possibly required ???
-//# define _STLP_NO_FRIEND_TEMPLATES 1
-#endif
-
-// Compiler does not accept friend declaration qualified with namespace name.
-// # define _STLP_NO_QUALIFIED_FRIENDS 1
-
-// Uncomment if partial specialization is not available
-# if defined(__WINS__)
-//# define _STLP_NO_CLASS_PARTIAL_SPECIALIZATION 1
-# endif
-
-// Define if class being partially specialized require full name (template parameters)
-// of itself for method declarations
-// # define _STLP_PARTIAL_SPEC_NEEDS_TEMPLATE_ARGS
-
-// Compiler has problems specializing members of partially
-// specialized class
-// # define _STLP_MEMBER_SPECIALIZATION_BUG
-
-// Compiler requires typename keyword on outline method definition
-// explicitly taking nested types/typedefs
-// #define _STLP_TYPENAME_ON_RETURN_TYPE
-
-// * _STLP_STATIC_CONST_INIT_BUG: defined if the compiler can't handle a
-// constant-initializer in the declaration of a static const data member
-// of integer type. (See section 9.4.2, paragraph 4, of the C++ standard.)
-#if defined(__WINS__)
-//# define _STLP_STATIC_CONST_INIT_BUG
-#endif
-
-// Define if default constructor for builtin integer type fails to initialize it to 0
-// # define _STLP_DEFAULT_CONSTRUCTOR_BUG 1
-
-// Defined if constructor
-// required to explicitly call member's default constructors for const objects
-// # define _STLP_CONST_CONSTRUCTOR_BUG 1
-
-// Define this if compiler lacks <exception> header
-# define _STLP_NO_EXCEPTION_HEADER 1
-
-// Uncomment if native new-style C library headers lile <cstddef>, etc are not available.
-# define _STLP_HAS_NO_NEW_C_HEADERS 1
-
-// uncomment if new-style headers <new> is available
-// # define _STLP_HAS_NEW_NEW_HEADER 1
-
-// uncomment this if <iostream> and other STD headers put their stuff in ::namespace,
-// not std::
-// # define _STLP_VENDOR_GLOBAL_STD
-
-// uncomment this if <cstdio> and the like put stuff in ::namespace,
-// not std::
-# define _STLP_VENDOR_GLOBAL_CSTD
-/*
-# ifdef _PTHREADS
-# undef _PTHREADS
-# endif
-# ifdef _STLP_PTHREADS
-# undef _STLP_PTHREADS
-# endif
-# ifdef _STLP_THREADS
-# undef _STLP_THREADS
-# endif
-*/
-# define _STLP_NATIVE_INCLUDE_PATH
-# define _STLP_NATIVE_C_INCLUTE_PATH
-
-# define _STLP_NO_NEW_HEADER
-# define _STLP_NO_THREADS
-
-# define _STLP_NO_EXCEPTIONS
-
-# define _STLP_USE_NEWALLOC
-//# define _STLP_NO_NODE_ALLOC
-# define _STLP_NO_LONG_DOUBLE
-# define _STLP_BIG_ENDIAN
-// this one causes recursive abs() calls
-# define _STLP_LABS
-# define _STLP_LDIV
-# define _STLP_CONST_CONSTRUCTOR_BUG
-// # define _STLP_HAS_NAMESPACES
-
-#ifdef _STLP_USE_NEW_C_HEADERS
-#undef _STLP_USE_NEW_C_HEADERS
-#endif
-
-#undef _STLP_NATIVE_C_HEADER
-#ifndef __SYMBIAN32__
-#define _STLP_NATIVE_C_HEADER(x) <libc/##x>
-#endif
-#define _STLP_NATIVE_HEADER(x) <x>
-
-// -----------------------------------------------------------------------------
-// wstring support
-// This is a bit confusing.
-// * _STLP_NO_WCHAR_T inhibits the standard C wchar functions (Symbian doesn't
-// have them).
-// * _STLP_HAS_WCHAR_T triggers the typedef of wstring. It's based on wint_t,
-// which isn't typedef's elsewhere, so we take care of it here.
-// -----------------------------------------------------------------------------
-//# define _STLP_NO_WCHAR_T 1
-# define _STLP_HAS_WCHAR_T 1
-# define _STLP_WCHAR_T_IS_USHORT 1
-# include <wchar.h>
-
-#define _STLP_COMPLEX_SPECIALIZATION_BUG
-#define _STLP_USE_EXCEPTIONS
-#define _STLP_EXTERN_RANGE_ERRORS
-//#define _STLP_NO_FORCE_INSTANTIATE
-//#define __BUILDING_STLPORT
-//# define _STLP_USE_STDIO_IO
-# define _STLP_NO_NEW_NEW_HEADER
-# define _STLP_USE_DECLSPEC
-#define __LIBSTD_CPP_SYMBIAN32_WSD__
-
-//==========================================================
-#endif // _STLP_WINSCW
+#endif //_STL_WINSCW_H_