diff -r 666f914201fb -r 2fe1408b6811 epoc32/include/symcpp.h --- a/epoc32/include/symcpp.h Tue Nov 24 13:55:44 2009 +0000 +++ b/epoc32/include/symcpp.h Tue Mar 16 16:12:26 2010 +0000 @@ -1,1 +1,50 @@ -symcpp.h +// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). +// All rights reserved. +// This component and the accompanying materials are made available +// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members +// which accompanies this distribution, and is available +// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// e32\compsupp\symcpp\symcpp.h +// This is a preinclude file for the symbian cpp specific defintions from RVCT2.2 onwards +// +// + +#ifdef __ARMCC_VERSION +#if (__ARMCC_VERSION < 220000 || __ARMCC_VERSION >= 230000) +#error This instantiation of the build requires use of RVCT 2.2 +#endif +#endif + +// Deal with operator new issues here +#ifdef __cplusplus +namespace std { + struct nothrow_t { }; + extern const nothrow_t nothrow; +} + +IMPORT_C void* operator new(unsigned int aSize) __NO_THROW; + +IMPORT_C void* operator new(unsigned int aSize,unsigned int aSize1) __NO_THROW; + +IMPORT_C void* operator new[](unsigned int aSize) __NO_THROW; + +IMPORT_C void* operator new(unsigned int aSize, const std::nothrow_t& aNoThrow) __NO_THROW; + +IMPORT_C void* operator new[](unsigned int aSize, const std::nothrow_t& aNoThrow) __NO_THROW; + +IMPORT_C void operator delete(void* aPtr) __NO_THROW; + +IMPORT_C void operator delete[](void* aPtr) __NO_THROW; + +IMPORT_C void operator delete(void* aPtr, const std::nothrow_t& aNoThrow) __NO_THROW; + +IMPORT_C void operator delete[](void* aPtr, const std::nothrow_t& aNoThrow) __NO_THROW; + +#endif