1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compilation with -fno-exceptions

Browse Source 
Change-Id: I3dbe8be62d2fe94ed6f97fb565a9e417544c58f9
Reviewed-by: Thiago Macieira (Intel) <thiago.macieira@intel.com>
This commit is contained in:
David Faure 2011-10-23 14:25:28 +02:00 committed by Qt by Nokia
parent dfa24768a3
commit c7865e0fc6
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/auto/integrationtests/exceptionsafety_objects/oomsimulator.h
View File

@ -252,8 +252,10 @@ struct AllocFailer
static void *new_helper(std::size_t size) static void *new_helper(std::size_t size)
{ {
void *ptr = malloc(size); void *ptr = malloc(size);
#ifndef QT_NO_EXCEPTIONS
if (!ptr) if (!ptr)
throw std::bad_alloc(); throw std::bad_alloc();
#endif
return ptr; return ptr;
} }
@ -263,8 +265,10 @@ static void *new_helper(std::size_t size)
#endif #endif
// overload operator new // overload operator new
#ifndef QT_NO_EXCEPTIONS
void* operator new(size_t size) throw (std::bad_alloc) { return new_helper(size); } void* operator new(size_t size) throw (std::bad_alloc) { return new_helper(size); }
void* operator new[](size_t size) throw (std::bad_alloc) { return new_helper(size); } void* operator new[](size_t size) throw (std::bad_alloc) { return new_helper(size); }
#endif
void* operator new(size_t size, const std::nothrow_t&) throw() { return malloc(size); } void* operator new(size_t size, const std::nothrow_t&) throw() { return malloc(size); }
void* operator new[](std::size_t size, const std::nothrow_t&) throw() { return malloc(size); } void* operator new[](std::size_t size, const std::nothrow_t&) throw() { return malloc(size); }