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

Moved error handling functions/macros to be header-only.

Browse Source
This commit is contained in:
David Williams 2015-02-06 21:08:19 +01:00
parent 6e8d9dfb75
commit 4325ffabc4
4 changed files with 44 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/PolyVoxCore/CMakeLists.txt
View File

@ -82,7 +82,7 @@ SET(CORE_INC_FILES
)
SET(IMPL_SRC_FILES
source/Impl/ErrorHandling.cpp
#source/Impl/ErrorHandling.cpp
source/Impl/Logging.cpp
#source/Impl/MarchingCubesTables.cpp
#source/Impl/RandomUnitVectors.cpp

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

@ -155,8 +155,49 @@ freely, subject to the following restrictions:
{
typedef void (*ThrowHandler)(std::exception& e, const char* file, int line);
ThrowHandler getThrowHandler();
void setThrowHandler(ThrowHandler newHandler);
inline void defaultThrowHandler(std::exception& e, const char* file, int line)
{
std::stringstream ss; \
ss << "\n"; \
ss << " PolyVox exception thrown!"; \
ss << " ========================="; \
ss << " PolyVox has tried to throw an exception but it was built without support"; \
ss << " for exceptions. In this scenario PolyVox will call a 'throw handler'"; \
ss << " and this message is being printed by the default throw handler."; \
ss << "\n"; \
ss << " If you don't want to enable exceptions then you should try to determine why"; \
ss << " this exception was thrown and make sure it doesn't happen again. If it was"; \
ss << " due to something like an invalid argument to a function then you should be"; \
ss << " able to fix it quite easily by validating parameters as appropriate. More"; \
ss << " complex exception scenarios (out of memory, etc) might be harder to fix and"; \
ss << " you should replace this default handler with something which is more"; \
ss << " meaningful to your users."; \
ss << "\n"; \
ss << " Exception details"; \
ss << " -----------------"; \
ss << " Line: " << line; \
ss << " File: " << file; \
ss << " Message: " << e.what(); \
ss << "\n"; \
PolyVox::Impl::getLoggerInstance()->logFatalMessage(ss.str()); \
POLYVOX_HALT(); \
}
inline ThrowHandler& getThrowHandlerInstance()
{
static ThrowHandler s_fThrowHandler = &defaultThrowHandler;
return s_fThrowHandler;
}
inline ThrowHandler getThrowHandler()
{
return getThrowHandlerInstance();
}
inline void setThrowHandler(ThrowHandler fNewHandler)
{
getThrowHandlerInstance() = fNewHandler;
}
}
#define POLYVOX_THROW_IF(condition, type, message) \

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

@ -1,74 +0,0 @@
/*******************************************************************************
Copyright (c) 2005-2009 David Williams
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source
distribution.
*******************************************************************************/
#include "PolyVoxCore/Impl/ErrorHandling.h"
namespace PolyVox
{
#ifndef POLYVOX_THROW_ENABLED
void defaultThrowHandler(std::exception& e, const char* file, int line)
{
std::stringstream ss; \
ss << "\n"; \
ss << " PolyVox exception thrown!"; \
ss << " ========================="; \
ss << " PolyVox has tried to throw an exception but it was built without support"; \
ss << " for exceptions. In this scenario PolyVox will call a 'throw handler'"; \
ss << " and this message is being printed by the default throw handler."; \
ss << "\n"; \
ss << " If you don't want to enable exceptions then you should try to determine why"; \
ss << " this exception was thrown and make sure it doesn't happen again. If it was"; \
ss << " due to something like an invalid argument to a function then you should be"; \
ss << " able to fix it quite easily by validating parameters as appropriate. More"; \
ss << " complex exception scenarios (out of memory, etc) might be harder to fix and"; \
ss << " you should replace this default handler with something which is more"; \
ss << " meaningful to your users."; \
ss << "\n"; \
ss << " Exception details"; \
ss << " -----------------"; \
ss << " Line: " << line; \
ss << " File: " << file; \
ss << " Message: " << e.what(); \
ss << "\n"; \
PolyVox::Impl::getLoggerInstance()->logFatalMessage(ss.str()); \
POLYVOX_HALT(); \
}
ThrowHandler& getThrowHandlerInstance()
{
static ThrowHandler s_fThrowHandler = &defaultThrowHandler;
return s_fThrowHandler;
}
ThrowHandler getThrowHandler()
{
return getThrowHandlerInstance();
}
void setThrowHandler(ThrowHandler fNewHandler)
{
getThrowHandlerInstance() = fNewHandler;
}
#endif
}

0
library/PolyVoxCore/source/Impl/Timer.cpp
View File