From 0cabfb6cfa700f30dc20fb6b6f3c81ca3c55f9ea Mon Sep 17 00:00:00 2001
From: castano <castano@95f4ed2b-212e-0410-8b90-d31948207fce>
Date: Tue, 16 Mar 2010 22:35:20 +0000
Subject: [PATCH] misc.

---
 src/nvcore/Algorithms.h | 2 +-
 src/nvcore/Containers.h | 8 ++++----
 src/nvcore/Debug.cpp    | 9 +++++----
 src/nvcore/Debug.h      | 2 +-
 src/nvcore/FileSystem.h | 2 +-
 src/nvcore/Library.h    | 2 +-
 src/nvcore/Memory.h     | 2 +-
 src/nvcore/Ptr.h        | 4 ++--
 src/nvcore/RefCounted.h | 4 ++--
 src/nvcore/StrLib.cpp   | 2 +-
 src/nvcore/StrLib.h     | 4 ++--
 src/nvcore/Stream.h     | 4 ++--
 src/nvcore/TextReader.h | 4 ++--
 src/nvcore/TextWriter.h | 4 ++--
 src/nvcore/Timer.h      | 2 +-
 15 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/src/nvcore/Algorithms.h b/src/nvcore/Algorithms.h
index b543b11..ee69af5 100644
--- a/src/nvcore/Algorithms.h
+++ b/src/nvcore/Algorithms.h
@@ -3,7 +3,7 @@
 #ifndef NV_CORE_ALGORITHMS_H
 #define NV_CORE_ALGORITHMS_H
 
-#include <nvcore/nvcore.h>
+#include "nvcore.h"
 
 namespace nv
 {
diff --git a/src/nvcore/Containers.h b/src/nvcore/Containers.h
index 08c60e9..ac0cbae 100644
--- a/src/nvcore/Containers.h
+++ b/src/nvcore/Containers.h
@@ -16,10 +16,10 @@ Do not use memmove in insert & remove, use copy ctors instead.
 
 
 // nvcore
-#include <nvcore/nvcore.h>
-#include <nvcore/Memory.h>
-#include <nvcore/Debug.h>
-//#include <nvcore/Stream.h>
+#include "nvcore.h"
+#include "Memory.h"
+#include "Debug.h"
+//#include "Stream.h"
 
 #include <string.h>	// memmove
 #include <new>		// for placement new
diff --git a/src/nvcore/Debug.cpp b/src/nvcore/Debug.cpp
index 922bce7..55a10b6 100644
--- a/src/nvcore/Debug.cpp
+++ b/src/nvcore/Debug.cpp
@@ -1,7 +1,7 @@
 // This code is in the public domain -- castanyo@yahoo.es
 
-#include <nvcore/Debug.h>
-#include <nvcore/StrLib.h>
+#include "Debug.h"
+#include "StrLib.h"
 
 // Extern
 #if NV_OS_WIN32 //&& NV_CC_MSVC
@@ -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,7 +360,8 @@ namespace
 			
 			if( ret == NV_ABORT_EXIT ) {
 				// Exit cleanly.
-				throw std::runtime_error("Assertion failed");
+				//throw std::runtime_error("Assertion failed");
+                throw "Assertion failed";
 			}
 			
 			return ret;			
diff --git a/src/nvcore/Debug.h b/src/nvcore/Debug.h
index c1f0ca5..3935211 100644
--- a/src/nvcore/Debug.h
+++ b/src/nvcore/Debug.h
@@ -3,7 +3,7 @@
 #ifndef NV_CORE_DEBUG_H
 #define NV_CORE_DEBUG_H
 
-#include <nvcore/nvcore.h>
+#include "nvcore.h"
 
 #if defined(HAVE_STDARG_H)
 #	include <stdarg.h>	// va_list
diff --git a/src/nvcore/FileSystem.h b/src/nvcore/FileSystem.h
index 4d87158..97447ca 100644
--- a/src/nvcore/FileSystem.h
+++ b/src/nvcore/FileSystem.h
@@ -3,7 +3,7 @@
 #ifndef NV_CORE_FILESYSTEM_H
 #define NV_CORE_FILESYSTEM_H
 
-#include <nvcore/nvcore.h>
+#include "nvcore.h"
 
 namespace nv
 {
diff --git a/src/nvcore/Library.h b/src/nvcore/Library.h
index ee7d416..00879f0 100644
--- a/src/nvcore/Library.h
+++ b/src/nvcore/Library.h
@@ -3,7 +3,7 @@
 #ifndef NV_CORE_LIBRARY_H
 #define NV_CORE_LIBRARY_H
 
-#include <nvcore/nvcore.h>
+#include "nvcore.h"
 
 #if NV_OS_WIN32
 #define LIBRARY_NAME(name)	#name ".dll"
diff --git a/src/nvcore/Memory.h b/src/nvcore/Memory.h
index d699926..43fbe50 100644
--- a/src/nvcore/Memory.h
+++ b/src/nvcore/Memory.h
@@ -3,7 +3,7 @@
 #ifndef NV_CORE_MEMORY_H
 #define NV_CORE_MEMORY_H
 
-#include <nvcore/nvcore.h>
+#include "nvcore.h"
 
 #include <stdlib.h> // malloc(), realloc() and free()
 #include <stddef.h>	// size_t
diff --git a/src/nvcore/Ptr.h b/src/nvcore/Ptr.h
index 2cbe523..27e9965 100644
--- a/src/nvcore/Ptr.h
+++ b/src/nvcore/Ptr.h
@@ -3,8 +3,8 @@
 #ifndef NV_CORE_PTR_H
 #define NV_CORE_PTR_H
 
-#include <nvcore/nvcore.h>
-#include <nvcore/Debug.h>
+#include "nvcore.h"
+#include "Debug.h"
 
 #include <stdio.h>	// NULL
 
diff --git a/src/nvcore/RefCounted.h b/src/nvcore/RefCounted.h
index 309b2ad..9ff3bff 100644
--- a/src/nvcore/RefCounted.h
+++ b/src/nvcore/RefCounted.h
@@ -3,8 +3,8 @@
 #ifndef NV_CORE_REFCOUNTED_H
 #define NV_CORE_REFCOUNTED_H
 
-#include <nvcore/nvcore.h>
-#include <nvcore/Debug.h>
+#include "nvcore.h"
+#include "Debug.h"
 
 
 namespace nv
diff --git a/src/nvcore/StrLib.cpp b/src/nvcore/StrLib.cpp
index 34cf992..a0ee451 100644
--- a/src/nvcore/StrLib.cpp
+++ b/src/nvcore/StrLib.cpp
@@ -1,6 +1,6 @@
 // This code is in the public domain -- castanyo@yahoo.es
 
-#include <nvcore/StrLib.h>
+#include "StrLib.h"
 
 #include <math.h>	// log
 #include <stdio.h>	// vsnprintf
diff --git a/src/nvcore/StrLib.h b/src/nvcore/StrLib.h
index 8012271..c20f6b0 100644
--- a/src/nvcore/StrLib.h
+++ b/src/nvcore/StrLib.h
@@ -3,8 +3,8 @@
 #ifndef NV_CORE_STRING_H
 #define NV_CORE_STRING_H
 
-#include <nvcore/nvcore.h>
-#include <nvcore/Containers.h>	// swap
+#include "nvcore.h"
+#include "Containers.h"	// swap
 
 #include <string.h> // strlen, strcmp, etc.
 
diff --git a/src/nvcore/Stream.h b/src/nvcore/Stream.h
index 82a9a3f..11a88a6 100644
--- a/src/nvcore/Stream.h
+++ b/src/nvcore/Stream.h
@@ -3,8 +3,8 @@
 #ifndef NV_CORE_STREAM_H
 #define NV_CORE_STREAM_H
 
-#include <nvcore/nvcore.h>
-#include <nvcore/Debug.h>
+#include "nvcore.h"
+#include "Debug.h"
 
 namespace nv
 {
diff --git a/src/nvcore/TextReader.h b/src/nvcore/TextReader.h
index 513ec0f..791f067 100644
--- a/src/nvcore/TextReader.h
+++ b/src/nvcore/TextReader.h
@@ -3,8 +3,8 @@
 #ifndef NV_CORE_TEXTREADER_H
 #define NV_CORE_TEXTREADER_H
 
-#include <nvcore/Containers.h>
-#include <nvcore/Stream.h>
+#include "Containers.h"
+#include "Stream.h"
 
 namespace nv
 {
diff --git a/src/nvcore/TextWriter.h b/src/nvcore/TextWriter.h
index 9d90002..4661118 100644
--- a/src/nvcore/TextWriter.h
+++ b/src/nvcore/TextWriter.h
@@ -3,8 +3,8 @@
 #ifndef NV_CORE_TEXTWRITER_H
 #define NV_CORE_TEXTWRITER_H
 
-#include <nvcore/StrLib.h>
-#include <nvcore/Stream.h>
+#include "StrLib.h"
+#include "Stream.h"
 
 namespace nv
 {
diff --git a/src/nvcore/Timer.h b/src/nvcore/Timer.h
index d6cb030..e4a5de4 100644
--- a/src/nvcore/Timer.h
+++ b/src/nvcore/Timer.h
@@ -3,7 +3,7 @@
 #ifndef NV_CORE_TIMER_H
 #define NV_CORE_TIMER_H
 
-#include <nvcore/nvcore.h>
+#include "nvcore.h"
 
 #if 1