From dfa6f06337e982056b297adce5349f6c302c2103 Mon Sep 17 00:00:00 2001 From: Lynix Date: Tue, 3 Nov 2015 22:34:46 +0100 Subject: [PATCH] Core/Error: Make NazaraAssert blocklike (fixing integration) Former-commit-id: c6b7e10e30504ef14ef83d0a4d07f17adfd7b026 --- include/Nazara/Core/Error.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/Nazara/Core/Error.hpp b/include/Nazara/Core/Error.hpp index f970b5ba8..badfa39c2 100644 --- a/include/Nazara/Core/Error.hpp +++ b/include/Nazara/Core/Error.hpp @@ -14,9 +14,9 @@ #include #if NAZARA_CORE_ENABLE_ASSERTS || defined(NAZARA_DEBUG) - #define NazaraAssert(a, err) if (!(a)) Nz::Error::Trigger(Nz::ErrorType_AssertFailed, err, __LINE__, Nz::Directory::GetCurrentFileRelativeToEngine(__FILE__), NAZARA_FUNCTION) + #define NazaraAssert(a, err) do { if (!(a)) Nz::Error::Trigger(Nz::ErrorType_AssertFailed, err, __LINE__, Nz::Directory::GetCurrentFileRelativeToEngine(__FILE__), NAZARA_FUNCTION); } while (false) #else - #define NazaraAssert(a, err) + #define NazaraAssert(a, err) do {} while (false) #endif #define NazaraError(err) Nz::Error::Trigger(Nz::ErrorType_Normal, err, __LINE__, Nz::Directory::GetCurrentFileRelativeToEngine(__FILE__), NAZARA_FUNCTION)