Fix errors after merge. Update cmake files.

2010-03-16 22:46:09 +00:00
parent a19e25228f
commit 3b0e0c3402
3 changed files with 12 additions and 12 deletions
--- a/src/nvcore/Debug.cpp
+++ b/src/nvcore/Debug.cpp
@ -48,7 +48,7 @@
 #	endif
 #endif

-//#include <stdexcept> // std::runtime_error
+#include <stdexcept> // std::runtime_error
 #undef assert // defined on mingw

 using namespace nv;
@ -360,8 +360,7 @@ namespace
 			
 			if( ret == NV_ABORT_EXIT ) {
 				// Exit cleanly.
-				//throw std::runtime_error("Assertion failed");
-                throw "Assertion failed";
+				throw std::runtime_error("Assertion failed");
 			}
 			
 			return ret;