Browse Source

Fix missing throw() declaration to silence g++.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@667 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
aramis_acg 15 years ago
parent
commit
d86314d02e
1 changed files with 2 additions and 2 deletions
  1. 2 2
      code/Importer.cpp

+ 2 - 2
code/Importer.cpp

@@ -252,7 +252,7 @@ void* AllocateFromAssimpHeap::operator new ( size_t num_bytes)	{
 	return ::operator new(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	{
 	try	{
 		return AllocateFromAssimpHeap::operator new( num_bytes );
 		return AllocateFromAssimpHeap::operator new( num_bytes );
 	}
 	}
@@ -269,7 +269,7 @@ void* AllocateFromAssimpHeap::operator new[] ( size_t num_bytes)	{
 	return ::operator new[](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	{
 	try	{
 		return AllocateFromAssimpHeap::operator new[]( num_bytes );
 		return AllocateFromAssimpHeap::operator new[]( num_bytes );
 	}
 	}