From d86314d02e2725e619502af778765c0eaadd9357 Mon Sep 17 00:00:00 2001 From: aramis_acg Date: Sun, 11 Apr 2010 02:29:46 +0000 Subject: [PATCH] Fix missing throw() declaration to silence g++. git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@667 67173fc5-114c-0410-ac8e-9d2fd5bffc1f --- code/Importer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/Importer.cpp b/code/Importer.cpp index 8c3534d49..264898125 100644 --- a/code/Importer.cpp +++ b/code/Importer.cpp @@ -252,7 +252,7 @@ void* AllocateFromAssimpHeap::operator new ( size_t num_bytes) { return ::operator new(num_bytes); } -void* AllocateFromAssimpHeap::operator new ( size_t num_bytes, const std::nothrow_t& ) { +void* AllocateFromAssimpHeap::operator new ( size_t num_bytes, const std::nothrow_t& ) throw() { try { return AllocateFromAssimpHeap::operator new( num_bytes ); } @@ -269,7 +269,7 @@ void* AllocateFromAssimpHeap::operator new[] ( size_t num_bytes) { return ::operator new[](num_bytes); } -void* AllocateFromAssimpHeap::operator new[] ( size_t num_bytes, const std::nothrow_t& ) { +void* AllocateFromAssimpHeap::operator new[] ( size_t num_bytes, const std::nothrow_t& ) throw() { try { return AllocateFromAssimpHeap::operator new[]( num_bytes ); }