mnalis/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Fixed macroses to fit into if scope

Browse source
This commit is contained in:
Alex Zolotarev 2011-10-19 03:29:07 +02:00 • committed by Alex Zolotarev
parent 3a26304e0d
commit 3369ab5a6b
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
base/assert.hpp
View file

@ -16,39 +16,39 @@ namespace my
}
// TODO: Evaluate X only once in CHECK().
#define CHECK(X, msg) if (X) {} else { \
::my::OnAssertFailed(SRC(), ::my::impl::MergeMsg("CHECK("#X")", ::my::impl::Message msg));}
#define CHECK_EQUAL(X, Y, msg) if ((X) == (Y)) {} else { \
#define CHECK(X, msg) do { if (X) {} else { \
::my::OnAssertFailed(SRC(), ::my::impl::MergeMsg("CHECK("#X")", ::my::impl::Message msg));} } while(false)
#define CHECK_EQUAL(X, Y, msg) do { if ((X) == (Y)) {} else { \
::my::OnAssertFailed(SRC(), ::my::impl::MergeMsg("CHECK("#X" == "#Y")", \
::my::impl::Message(X, Y), \
::my::impl::Message msg));}
#define CHECK_NOT_EQUAL(X, Y, msg) if ((X) != (Y)) {} else { \
::my::impl::Message msg));} } while (false)
#define CHECK_NOT_EQUAL(X, Y, msg) do { if ((X) != (Y)) {} else { \
::my::OnAssertFailed(SRC(), ::my::impl::MergeMsg("CHECK("#X" != "#Y")", \
::my::impl::Message(X, Y), \
::my::impl::Message msg));}
#define CHECK_LESS(X, Y, msg) if ((X) < (Y)) {} else { \
::my::impl::Message msg));} } while (false)
#define CHECK_LESS(X, Y, msg) do { if ((X) < (Y)) {} else { \
::my::OnAssertFailed(SRC(), ::my::impl::MergeMsg("CHECK("#X" < "#Y")", \
::my::impl::Message(X, Y), \
::my::impl::Message msg));}
#define CHECK_LESS_OR_EQUAL(X, Y, msg) if ((X) <= (Y)) {} else { \
::my::impl::Message msg));} } while (false)
#define CHECK_LESS_OR_EQUAL(X, Y, msg) do { if ((X) <= (Y)) {} else { \
::my::OnAssertFailed(SRC(), ::my::impl::MergeMsg("CHECK("#X" <= "#Y")", \
::my::impl::Message(X, Y), \
::my::impl::Message msg));}
#define CHECK_GREATER(X, Y, msg) if ((X) > (Y)) {} else { \
::my::impl::Message msg));} } while (false)
#define CHECK_GREATER(X, Y, msg) do { if ((X) > (Y)) {} else { \
::my::OnAssertFailed(SRC(), ::my::impl::MergeMsg("CHECK("#X" > "#Y")", \
::my::impl::Message(X, Y), \
::my::impl::Message msg));}
#define CHECK_GREATER_OR_EQUAL(X, Y, msg) if ((X) >= (Y)) {} else { \
::my::impl::Message msg));} } while (false)
#define CHECK_GREATER_OR_EQUAL(X, Y, msg) do { if ((X) >= (Y)) {} else { \
::my::OnAssertFailed(SRC(), ::my::impl::MergeMsg("CHECK("#X" >= "#Y")", \
::my::impl::Message(X, Y), \
::my::impl::Message msg));}
#define CHECK_OR_CALL(fail, call, X, msg) if (X) {} else { \
::my::impl::Message msg));} } while (false)
#define CHECK_OR_CALL(fail, call, X, msg) do { if (X) {} else { \
if (fail) {\
::my::OnAssertFailed(SRC(), ::my::impl::MergeMsg(::my::impl::Message("CHECK("#X")"), \
::my::impl::Message msg)); \
} else { \
call(); \
} }
} } } while (false)
#ifdef DEBUG
// for Symbian compatibility

8
base/logging.hpp
View file

@ -31,9 +31,9 @@ using ::my::LCRITICAL;
// Logging macro.
// Example usage: LOG(LINFO, (Calc(), m_Var, "Some string constant"));
#define LOG(level, msg) if (level < ::my::g_LogLevel) {} \
else do { ::my::LogMessage(level, SRC(), ::my::impl::Message msg); } while (false)
#define LOG(level, msg) do { if (level < ::my::g_LogLevel) {} \
else { ::my::LogMessage(level, SRC(), ::my::impl::Message msg);} } while (false)
// Logging macro with short info (without entry point)
#define LOG_SHORT(level, msg) if (level < ::my::g_LogLevel) {} \
else do { ::my::LogMessage(level, my::SrcPoint(), ::my::impl::Message msg); } while (false)
#define LOG_SHORT(level, msg) do { if (level < ::my::g_LogLevel) {} \
else { ::my::LogMessage(level, my::SrcPoint(), ::my::impl::Message msg);} } while (false)