diff --git a/include/bx/error.h b/include/bx/error.h index 7b21ca3..ab9fa86 100644 --- a/include/bx/error.h +++ b/include/bx/error.h @@ -71,7 +71,7 @@ namespace bx }; /// Do nothing even if error is set. - class ErrorIgnore : public Error + class ErrorIgnore final : public Error { public: /// @@ -79,7 +79,7 @@ namespace bx }; /// In debug build assert if error is set. - class ErrorAssert : public Error + class ErrorAssert final : public Error { public: /// @@ -90,7 +90,7 @@ namespace bx }; /// Exit application if error is set. - class ErrorFatal : public Error + class ErrorFatal final : public Error { public: /// diff --git a/include/bx/inline/error.inl b/include/bx/inline/error.inl index 87e36b8..176a60b 100644 --- a/include/bx/inline/error.inl +++ b/include/bx/inline/error.inl @@ -68,7 +68,7 @@ namespace bx inline ErrorAssert::~ErrorAssert() { - BX_ASSERT(isOk(), "Error: 0x%08x `%S`" + BX_ASSERT(isOk(), "ErrorAssert: 0x%08x `%S`" , get().code , &getMessage() ); @@ -81,15 +81,10 @@ namespace bx inline ErrorFatal::~ErrorFatal() { - if (!isOk() ) - { - printf("Error: 0x%08x `%S`" - , get().code - , &getMessage() - ); - - exit(kExitFailure); - } + _BX_ASSERT(isOk(), "ErrorFatal: 0x%08x `%S`" + , get().code + , &getMessage() + ); } inline ErrorAssert::operator Error*() diff --git a/include/bx/macros.h b/include/bx/macros.h index f488f17..c453c0f 100644 --- a/include/bx/macros.h +++ b/include/bx/macros.h @@ -203,7 +203,7 @@ # if BX_CONFIG_DEBUG # define BX_ASSERT _BX_ASSERT # else -# define BX_ASSERT(_condition, ...) BX_NOOP() +# define BX_ASSERT(...) BX_NOOP() # endif // BX_CONFIG_DEBUG #endif // BX_ASSERT @@ -235,7 +235,7 @@ # if BX_CONFIG_DEBUG # define BX_WARN _BX_WARN # else -# define BX_WARN(_condition, ...) BX_NOOP() +# define BX_WARN(...) BX_NOOP() # endif // BX_CONFIG_DEBUG #endif // BX_ASSERT