N-archive/citra
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

log: updated MAX_LOGLEVEL to use correct log level enum type

Browse source
This commit is contained in:
bunnei 2014-06-01 11:49:58 -04:00
parent 5cd922d151
commit 00adbc7817
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/common/log.h
View file

@ -94,10 +94,10 @@ void GenericLog(LOGTYPES_LEVELS level, LOGTYPES_TYPE type, const char*file, int
; ;
#if defined LOGGING || defined _DEBUG || defined DEBUGFAST #if defined LOGGING || defined _DEBUG || defined DEBUGFAST
#define MAX_LOGLEVEL DEBUG_LEVEL #define MAX_LOGLEVEL LDEBUG
#else #else
#ifndef MAX_LOGLEVEL #ifndef MAX_LOGLEVEL
#define MAX_LOGLEVEL WARNING_LEVEL #define MAX_LOGLEVEL LWARNING
#endif // loglevel #endif // loglevel
#endif // logging #endif // logging
@ -109,7 +109,7 @@ void GenericLog(LOGTYPES_LEVELS level, LOGTYPES_TYPE type, const char*file, int
// Let the compiler optimize this out // Let the compiler optimize this out
#define GENERIC_LOG(t, v, ...) { \ #define GENERIC_LOG(t, v, ...) { \
if (v <= MAX_LOGLEVEL) \ if (v <= LogTypes::MAX_LOGLEVEL) \
GenericLog(v, t, __FILE__, __LINE__, __func__, __VA_ARGS__); \ GenericLog(v, t, __FILE__, __LINE__, __func__, __VA_ARGS__); \
} }

2
src/common/log_manager.cpp
View file

@ -149,7 +149,7 @@ LogContainer::LogContainer(const char* shortName, const char* fullName, bool ena
{ {
strncpy(m_fullName, fullName, 128); strncpy(m_fullName, fullName, 128);
strncpy(m_shortName, shortName, 32); strncpy(m_shortName, shortName, 32);
m_level = (LogTypes::LOG_LEVELS)MAX_LOGLEVEL; m_level = LogTypes::MAX_LOGLEVEL;
} }
// LogContainer // LogContainer

2
src/common/log_manager.h
View file

@ -97,7 +97,7 @@ private:
~LogManager(); ~LogManager();
public: 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, void Log(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char* file, int line,
const char* function, const char *fmt, va_list args); const char* function, const char *fmt, va_list args);