Mercurial > audlegacy-plugins

diff src/console/blargg_common.h @ 341:986f098da058 trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] - merge in blargg's changes
author nenolod
date Thu, 07 Dec 2006 15:20:41 -0800
parents fb513e10174e
children
line wrap: on
line diff
--- a/src/console/blargg_common.h	Wed Dec 06 07:57:05 2006 -0800
+++ b/src/console/blargg_common.h	Thu Dec 07 15:20:41 2006 -0800
@@ -54,8 +54,13 @@
 };
 
 #ifndef BLARGG_DISABLE_NOTHROW
+	#if __cplusplus < 199711
+		#define BLARGG_THROWS( spec )
+	#else
+		#define BLARGG_THROWS( spec ) throw spec
+	#endif
 	#define BLARGG_DISABLE_NOTHROW \
-		void* operator new ( size_t s ) { return malloc( s ); }\
+		void* operator new ( size_t s ) BLARGG_THROWS(()) { return malloc( s ); }\
 		void operator delete ( void* p ) { free( p ); }
 	#define BLARGG_NEW new
 #else