AnotherFoxGuy/polyvox
1
0
Fork 0
Code Issues Pull Requests Activity

Compile fixes brought across from Cubiquity.

Browse Source
This commit is contained in:
Daviw Williams
2013-05-16 16:17:01 +02:00
parent 9fa0cc8a2a
commit c806da9bb7
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/PolyVoxCore/include/PolyVoxCore/Impl/ErrorHandling.h
View File

@@ -121,7 +121,7 @@ namespace PolyVox
ss << " Condition: " << #condition << std::endl; \ ss << " Condition: " << #condition << std::endl; \
ss << " Message: " << (message) << std::endl; \ ss << " Message: " << (message) << std::endl; \
ss << " Location: " << "Line " << __LINE__ << " of " << __FILE__ << std::endl << std::endl; \ ss << " Location: " << "Line " << __LINE__ << " of " << __FILE__ << std::endl << std::endl; \
logFatal(ss.str()); \ PolyVox::logFatal(ss.str()); \
POLYVOX_HALT(); \ POLYVOX_HALT(); \
} \ } \
} while(0) \ } while(0) \
@@ -176,7 +176,7 @@ namespace PolyVox
*/ */
#ifdef POLYVOX_THROW_ENABLED #ifdef POLYVOX_THROW_ENABLED
#define POLYVOX_THROW(type, message) \ #define POLYVOX_THROW(type, message) \
log(message, LogLevels::Error); \ PolyVox::logError(message); \
throw type((message)) throw type((message))
#else #else
namespace PolyVox namespace PolyVox
@@ -188,7 +188,7 @@ namespace PolyVox
} }
#define POLYVOX_THROW(type, message) \ #define POLYVOX_THROW(type, message) \
log(message, LogLevels::Error); \ PolyVox::logError(message); \
type except = (type)((message)); \ type except = (type)((message)); \
getThrowHandler()((except), __FILE__, __LINE__) getThrowHandler()((except), __FILE__, __LINE__)
#endif #endif

2
library/PolyVoxCore/source/Impl/ErrorHandling.cpp
View File

@@ -133,7 +133,7 @@ namespace PolyVox
ss << " Line: " << line << std::endl; \ ss << " Line: " << line << std::endl; \
ss << " File: " << file << std::endl; \ ss << " File: " << file << std::endl; \
ss << " Message: " << e.what() << std::endl << std::endl; \ ss << " Message: " << e.what() << std::endl << std::endl; \
logFatal(ss.str()); \ PolyVox::logFatal(ss.str()); \
POLYVOX_HALT(); \ POLYVOX_HALT(); \
} }