This commit is contained in:
castano 2010-03-16 22:35:20 +00:00
parent 1fafffd8af
commit 0cabfb6cfa
15 changed files with 28 additions and 27 deletions

View File

@ -3,7 +3,7 @@
#ifndef NV_CORE_ALGORITHMS_H #ifndef NV_CORE_ALGORITHMS_H
#define NV_CORE_ALGORITHMS_H #define NV_CORE_ALGORITHMS_H
#include <nvcore/nvcore.h> #include "nvcore.h"
namespace nv namespace nv
{ {

View File

@ -16,10 +16,10 @@ Do not use memmove in insert & remove, use copy ctors instead.
// nvcore // nvcore
#include <nvcore/nvcore.h> #include "nvcore.h"
#include <nvcore/Memory.h> #include "Memory.h"
#include <nvcore/Debug.h> #include "Debug.h"
//#include <nvcore/Stream.h> //#include "Stream.h"
#include <string.h> // memmove #include <string.h> // memmove
#include <new> // for placement new #include <new> // for placement new

View File

@ -1,7 +1,7 @@
// This code is in the public domain -- castanyo@yahoo.es // This code is in the public domain -- castanyo@yahoo.es
#include <nvcore/Debug.h> #include "Debug.h"
#include <nvcore/StrLib.h> #include "StrLib.h"
// Extern // Extern
#if NV_OS_WIN32 //&& NV_CC_MSVC #if NV_OS_WIN32 //&& NV_CC_MSVC
@ -48,7 +48,7 @@
# endif # endif
#endif #endif
#include <stdexcept> // std::runtime_error //#include <stdexcept> // std::runtime_error
#undef assert // defined on mingw #undef assert // defined on mingw
using namespace nv; using namespace nv;
@ -360,7 +360,8 @@ namespace
if( ret == NV_ABORT_EXIT ) { if( ret == NV_ABORT_EXIT ) {
// Exit cleanly. // Exit cleanly.
throw std::runtime_error("Assertion failed"); //throw std::runtime_error("Assertion failed");
throw "Assertion failed";
} }
return ret; return ret;

View File

@ -3,7 +3,7 @@
#ifndef NV_CORE_DEBUG_H #ifndef NV_CORE_DEBUG_H
#define NV_CORE_DEBUG_H #define NV_CORE_DEBUG_H
#include <nvcore/nvcore.h> #include "nvcore.h"
#if defined(HAVE_STDARG_H) #if defined(HAVE_STDARG_H)
# include <stdarg.h> // va_list # include <stdarg.h> // va_list

View File

@ -3,7 +3,7 @@
#ifndef NV_CORE_FILESYSTEM_H #ifndef NV_CORE_FILESYSTEM_H
#define NV_CORE_FILESYSTEM_H #define NV_CORE_FILESYSTEM_H
#include <nvcore/nvcore.h> #include "nvcore.h"
namespace nv namespace nv
{ {

View File

@ -3,7 +3,7 @@
#ifndef NV_CORE_LIBRARY_H #ifndef NV_CORE_LIBRARY_H
#define NV_CORE_LIBRARY_H #define NV_CORE_LIBRARY_H
#include <nvcore/nvcore.h> #include "nvcore.h"
#if NV_OS_WIN32 #if NV_OS_WIN32
#define LIBRARY_NAME(name) #name ".dll" #define LIBRARY_NAME(name) #name ".dll"

View File

@ -3,7 +3,7 @@
#ifndef NV_CORE_MEMORY_H #ifndef NV_CORE_MEMORY_H
#define NV_CORE_MEMORY_H #define NV_CORE_MEMORY_H
#include <nvcore/nvcore.h> #include "nvcore.h"
#include <stdlib.h> // malloc(), realloc() and free() #include <stdlib.h> // malloc(), realloc() and free()
#include <stddef.h> // size_t #include <stddef.h> // size_t

View File

@ -3,8 +3,8 @@
#ifndef NV_CORE_PTR_H #ifndef NV_CORE_PTR_H
#define NV_CORE_PTR_H #define NV_CORE_PTR_H
#include <nvcore/nvcore.h> #include "nvcore.h"
#include <nvcore/Debug.h> #include "Debug.h"
#include <stdio.h> // NULL #include <stdio.h> // NULL

View File

@ -3,8 +3,8 @@
#ifndef NV_CORE_REFCOUNTED_H #ifndef NV_CORE_REFCOUNTED_H
#define NV_CORE_REFCOUNTED_H #define NV_CORE_REFCOUNTED_H
#include <nvcore/nvcore.h> #include "nvcore.h"
#include <nvcore/Debug.h> #include "Debug.h"
namespace nv namespace nv

View File

@ -1,6 +1,6 @@
// This code is in the public domain -- castanyo@yahoo.es // This code is in the public domain -- castanyo@yahoo.es
#include <nvcore/StrLib.h> #include "StrLib.h"
#include <math.h> // log #include <math.h> // log
#include <stdio.h> // vsnprintf #include <stdio.h> // vsnprintf

View File

@ -3,8 +3,8 @@
#ifndef NV_CORE_STRING_H #ifndef NV_CORE_STRING_H
#define NV_CORE_STRING_H #define NV_CORE_STRING_H
#include <nvcore/nvcore.h> #include "nvcore.h"
#include <nvcore/Containers.h> // swap #include "Containers.h" // swap
#include <string.h> // strlen, strcmp, etc. #include <string.h> // strlen, strcmp, etc.

View File

@ -3,8 +3,8 @@
#ifndef NV_CORE_STREAM_H #ifndef NV_CORE_STREAM_H
#define NV_CORE_STREAM_H #define NV_CORE_STREAM_H
#include <nvcore/nvcore.h> #include "nvcore.h"
#include <nvcore/Debug.h> #include "Debug.h"
namespace nv namespace nv
{ {

View File

@ -3,8 +3,8 @@
#ifndef NV_CORE_TEXTREADER_H #ifndef NV_CORE_TEXTREADER_H
#define NV_CORE_TEXTREADER_H #define NV_CORE_TEXTREADER_H
#include <nvcore/Containers.h> #include "Containers.h"
#include <nvcore/Stream.h> #include "Stream.h"
namespace nv namespace nv
{ {

View File

@ -3,8 +3,8 @@
#ifndef NV_CORE_TEXTWRITER_H #ifndef NV_CORE_TEXTWRITER_H
#define NV_CORE_TEXTWRITER_H #define NV_CORE_TEXTWRITER_H
#include <nvcore/StrLib.h> #include "StrLib.h"
#include <nvcore/Stream.h> #include "Stream.h"
namespace nv namespace nv
{ {

View File

@ -3,7 +3,7 @@
#ifndef NV_CORE_TIMER_H #ifndef NV_CORE_TIMER_H
#define NV_CORE_TIMER_H #define NV_CORE_TIMER_H
#include <nvcore/nvcore.h> #include "nvcore.h"
#if 1 #if 1