diff options
| author | flacs <tilkax@gmail.com> | 2015-09-27 03:18:03 +0200 |
|---|---|---|
| committer | flacs <tilkax@gmail.com> | 2015-09-27 03:18:03 +0200 |
| commit | 8ea9b07b59c8b45b6cbe1c559a228f5675dea71c (patch) | |
| tree | f14853056f7fd3edef2640eb9fc5b390ab4a6358 /Source/Core/Common/Logging | |
| parent | a91810ba3bb583a14a3e278527f2b801ceb29367 (diff) | |
| parent | cc036ca86cdaf709e01221975da734cb64d54a94 (diff) | |
Merge pull request #3093 from lioncash/header_shuffle
Common: Trim Common.h
Diffstat (limited to 'Source/Core/Common/Logging')
| -rw-r--r-- | Source/Core/Common/Logging/ConsoleListenerNix.cpp | 1 | ||||
| -rw-r--r-- | Source/Core/Common/Logging/Log.h | 41 | ||||
| -rw-r--r-- | Source/Core/Common/Logging/LogManager.h | 4 |
3 files changed, 4 insertions, 42 deletions
diff --git a/Source/Core/Common/Logging/ConsoleListenerNix.cpp b/Source/Core/Common/Logging/ConsoleListenerNix.cpp index b891b29090..6d01fbf706 100644 --- a/Source/Core/Common/Logging/ConsoleListenerNix.cpp +++ b/Source/Core/Common/Logging/ConsoleListenerNix.cpp @@ -9,6 +9,7 @@ #endif #include "Common/Logging/ConsoleListener.h" +#include "Common/Logging/Log.h" ConsoleListener::ConsoleListener() { diff --git a/Source/Core/Common/Logging/Log.h b/Source/Core/Common/Logging/Log.h index 41d9aa503a..24a4aa8884 100644 --- a/Source/Core/Common/Logging/Log.h +++ b/Source/Core/Common/Logging/Log.h @@ -4,9 +4,6 @@ #pragma once -#include "Common/CommonFuncs.h" -#include "Common/MsgHandler.h" - namespace LogTypes { @@ -101,41 +98,3 @@ void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, #define NOTICE_LOG(t,...) do { GENERIC_LOG(LogTypes::t, LogTypes::LNOTICE, __VA_ARGS__) } while (0) #define INFO_LOG(t,...) do { GENERIC_LOG(LogTypes::t, LogTypes::LINFO, __VA_ARGS__) } while (0) #define DEBUG_LOG(t,...) do { GENERIC_LOG(LogTypes::t, LogTypes::LDEBUG, __VA_ARGS__) } while (0) - -#ifdef _WIN32 -#define _dbg_assert_msg_(_t_, _a_, _msg_, ...)\ - if (MAX_LOGLEVEL >= LogTypes::LOG_LEVELS::LDEBUG && !(_a_)) {\ - ERROR_LOG(_t_, _msg_, __VA_ARGS__); \ - if (!PanicYesNo(_msg_, __VA_ARGS__)) \ - Crash(); \ - } -#else -#define _dbg_assert_msg_(_t_, _a_, _msg_, ...)\ - if (MAX_LOGLEVEL >= LogTypes::LOG_LEVELS::LDEBUG && !(_a_)) {\ - ERROR_LOG(_t_, _msg_, ##__VA_ARGS__); \ - if (!PanicYesNo(_msg_, ##__VA_ARGS__)) \ - Crash(); \ - } -#endif - -#ifdef _WIN32 -#define _assert_msg_(_t_, _a_, _fmt_, ...) \ - if (!(_a_)) {\ - if (!PanicYesNo(_fmt_, __VA_ARGS__)) \ - Crash(); \ - } -#else // not win32 -#define _assert_msg_(_t_, _a_, _fmt_, ...) \ - if (!(_a_)) {\ - if (!PanicYesNo(_fmt_, ##__VA_ARGS__)) \ - Crash(); \ - } -#endif // WIN32 - -#define _assert_(_a_) \ - _assert_msg_(MASTER_LOG, _a_, "Error...\n\n Line: %d\n File: %s\n Time: %s\n\nIgnore and continue?", \ - __LINE__, __FILE__, __TIME__) - -#define _dbg_assert_(_t_, _a_) \ - if (MAX_LOGLEVEL >= LogTypes::LOG_LEVELS::LDEBUG) \ - _assert_(_a_) diff --git a/Source/Core/Common/Logging/LogManager.h b/Source/Core/Common/Logging/LogManager.h index c03610ae02..e48f05e928 100644 --- a/Source/Core/Common/Logging/LogManager.h +++ b/Source/Core/Common/Logging/LogManager.h @@ -10,7 +10,9 @@ #include <set> #include <string> -#include "Common/Common.h" +#include "Common/CommonTypes.h" +#include "Common/NonCopyable.h" +#include "Common/Logging/Log.h" #define MAX_MESSAGES 8000 #define MAX_MSGLEN 1024 |