From 6fc62f8c93bd81f6207fcbdfe332b4e56c2aa2be Mon Sep 17 00:00:00 2001 From: bunnei Date: Thu, 29 May 2014 23:03:03 -0400 Subject: log: fixed to not print twice, enabled coloring, added OS print logging as its own type --- src/common/log_manager.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/common/log_manager.h') diff --git a/src/common/log_manager.h b/src/common/log_manager.h index 580860b4d..3e238dfa7 100644 --- a/src/common/log_manager.h +++ b/src/common/log_manager.h @@ -99,8 +99,8 @@ public: static u32 GetMaxLevel() { return MAX_LOGLEVEL; } - void Log(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, - const char *file, int line, const char *fmt, va_list args); + void Log(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char* file, int line, + const char* function, const char *fmt, va_list args); void SetLogLevel(LogTypes::LOG_TYPE type, LogTypes::LOG_LEVELS level) { -- cgit v1.2.3 From 00adbc7817194183dbea95ddfdb8678a5571c799 Mon Sep 17 00:00:00 2001 From: bunnei Date: Sun, 1 Jun 2014 11:49:58 -0400 Subject: log: updated MAX_LOGLEVEL to use correct log level enum type --- src/common/log_manager.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/common/log_manager.h') diff --git a/src/common/log_manager.h b/src/common/log_manager.h index 3e238dfa7..6d3d7c7ff 100644 --- a/src/common/log_manager.h +++ b/src/common/log_manager.h @@ -97,7 +97,7 @@ private: ~LogManager(); public: - static u32 GetMaxLevel() { return MAX_LOGLEVEL; } + static u32 GetMaxLevel() { return LogTypes::MAX_LOGLEVEL; } void Log(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char* file, int line, const char* function, const char *fmt, va_list args); -- cgit v1.2.3