From 8135c89683d2a38959c20cb8115501f7e5b22c7e Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Mon, 5 Aug 2013 17:38:15 -0700 Subject: [PATCH] Change to fatal_assert() --- .../beast/modules/beast_core/diagnostic/beast_FatalError.cpp | 2 +- Subtrees/beast/modules/beast_core/diagnostic/beast_FatalError.h | 2 +- Subtrees/beast/modules/beast_core/threads/beast_Thread.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Subtrees/beast/modules/beast_core/diagnostic/beast_FatalError.cpp b/Subtrees/beast/modules/beast_core/diagnostic/beast_FatalError.cpp index d2887a328e..0023938d37 100644 --- a/Subtrees/beast/modules/beast_core/diagnostic/beast_FatalError.cpp +++ b/Subtrees/beast/modules/beast_core/diagnostic/beast_FatalError.cpp @@ -123,7 +123,7 @@ public: // We don't really expect the program to run after this // but the unit test is here so you can manually test it. int shouldBeZero (1); - fatal_require (shouldBeZero == 0); + fatal_assert (shouldBeZero == 0); } }; diff --git a/Subtrees/beast/modules/beast_core/diagnostic/beast_FatalError.h b/Subtrees/beast/modules/beast_core/diagnostic/beast_FatalError.h index 30835ccf0b..4792d63abc 100644 --- a/Subtrees/beast/modules/beast_core/diagnostic/beast_FatalError.h +++ b/Subtrees/beast/modules/beast_core/diagnostic/beast_FatalError.h @@ -157,6 +157,6 @@ private: { if (beast::beast_isRunningUnderDebugger()) beast_breakDebugger; \ FatalError ("Assertion '" BEAST_STRINGIFY(expression) "' failed", __FILE__, __LINE__); \ BEAST_ANALYZER_NORETURN } -#define fatal_require(condition) { if (! (condition)) { fatal_require_report(condition); } } +#define fatal_assert(condition) { if (! (condition)) { fatal_require_report(condition); } } #endif diff --git a/Subtrees/beast/modules/beast_core/threads/beast_Thread.cpp b/Subtrees/beast/modules/beast_core/threads/beast_Thread.cpp index eb6167740d..d4efea45af 100644 --- a/Subtrees/beast/modules/beast_core/threads/beast_Thread.cpp +++ b/Subtrees/beast/modules/beast_core/threads/beast_Thread.cpp @@ -40,7 +40,7 @@ Thread::~Thread() To avoid this type of nastiness, always make sure you call stopThread() before or during your subclass's destructor. */ - fatal_require (! isThreadRunning()); + fatal_assert (! isThreadRunning()); } //==============================================================================