From 146ddff550a46022da89557833146496ac2d21e0 Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Sat, 13 Nov 2010 00:10:00 +0000 Subject: [PATCH] Simplify GenericLog() for C/C++. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6391 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Common/Src/Log.h | 15 +++++++++------ Source/Core/Common/Src/LogManager.cpp | 12 ------------ 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/Source/Core/Common/Src/Log.h b/Source/Core/Common/Src/Log.h index 605596b5d6..36b4d292e2 100644 --- a/Source/Core/Common/Src/Log.h +++ b/Source/Core/Common/Src/Log.h @@ -86,18 +86,21 @@ enum LOG_LEVELS { LDEBUG = DEBUG_LEVEL, }; +#ifdef __cplusplus +#define LOGTYPES_LEVELS LogTypes::LOG_LEVELS +#define LOGTYPES_TYPE LogTypes::LOG_TYPE +#else +#define LOGTYPES_LEVELS enum LOG_LEVELS +#define LOGTYPES_TYPE enum LOG_TYPE +#endif + #ifdef __cplusplus } // namespace -void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, - const char *file, int line, const char *fmt, ...); extern "C" { #endif -void GenericLogC(int level, int type, +void GenericLog(LOGTYPES_LEVELS level, LOGTYPES_TYPE type, const char *file, int line, const char *fmt, ...); -#ifndef __cplusplus -#define GenericLog GenericLogC -#endif #ifdef __cplusplus }; #endif diff --git a/Source/Core/Common/Src/LogManager.cpp b/Source/Core/Common/Src/LogManager.cpp index a51a3fae48..0122066abb 100644 --- a/Source/Core/Common/Src/LogManager.cpp +++ b/Source/Core/Common/Src/LogManager.cpp @@ -23,18 +23,6 @@ #include "Thread.h" #include "FileUtil.h" -void GenericLogC(int level, int type, - const char *file, int line, const char* fmt, ...) -{ - va_list args; - va_start(args, fmt); - if (LogManager::GetInstance()) - LogManager::GetInstance()->Log( - (LogTypes::LOG_LEVELS)level, (LogTypes::LOG_TYPE)type, - file, line, fmt, args); - va_end(args); -} - void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char *file, int line, const char* fmt, ...) {