diff options
author | bunnei <ericbunnie@gmail.com> | 2014-06-01 17:49:58 +0200 |
---|---|---|
committer | bunnei <ericbunnie@gmail.com> | 2014-06-01 17:49:58 +0200 |
commit | 00adbc7817194183dbea95ddfdb8678a5571c799 (patch) | |
tree | 40306165e2c7cddd978ecd0864d225c60f609270 /src/common | |
parent | log: updated GenericLog __attribute__ for newly added parameter (diff) | |
download | yuzu-00adbc7817194183dbea95ddfdb8678a5571c799.tar yuzu-00adbc7817194183dbea95ddfdb8678a5571c799.tar.gz yuzu-00adbc7817194183dbea95ddfdb8678a5571c799.tar.bz2 yuzu-00adbc7817194183dbea95ddfdb8678a5571c799.tar.lz yuzu-00adbc7817194183dbea95ddfdb8678a5571c799.tar.xz yuzu-00adbc7817194183dbea95ddfdb8678a5571c799.tar.zst yuzu-00adbc7817194183dbea95ddfdb8678a5571c799.zip |
Diffstat (limited to 'src/common')
-rw-r--r-- | src/common/log.h | 6 | ||||
-rw-r--r-- | src/common/log_manager.cpp | 2 | ||||
-rw-r--r-- | src/common/log_manager.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/common/log.h b/src/common/log.h index 3518d4e1d..a3c8bdde6 100644 --- a/src/common/log.h +++ b/src/common/log.h @@ -94,10 +94,10 @@ void GenericLog(LOGTYPES_LEVELS level, LOGTYPES_TYPE type, const char*file, int ; #if defined LOGGING || defined _DEBUG || defined DEBUGFAST -#define MAX_LOGLEVEL DEBUG_LEVEL +#define MAX_LOGLEVEL LDEBUG #else #ifndef MAX_LOGLEVEL -#define MAX_LOGLEVEL WARNING_LEVEL +#define MAX_LOGLEVEL LWARNING #endif // loglevel #endif // logging @@ -109,7 +109,7 @@ void GenericLog(LOGTYPES_LEVELS level, LOGTYPES_TYPE type, const char*file, int // Let the compiler optimize this out #define GENERIC_LOG(t, v, ...) { \ - if (v <= MAX_LOGLEVEL) \ + if (v <= LogTypes::MAX_LOGLEVEL) \ GenericLog(v, t, __FILE__, __LINE__, __func__, __VA_ARGS__); \ } diff --git a/src/common/log_manager.cpp b/src/common/log_manager.cpp index d026fca56..b6caba3bf 100644 --- a/src/common/log_manager.cpp +++ b/src/common/log_manager.cpp @@ -149,7 +149,7 @@ LogContainer::LogContainer(const char* shortName, const char* fullName, bool ena { strncpy(m_fullName, fullName, 128); strncpy(m_shortName, shortName, 32); - m_level = (LogTypes::LOG_LEVELS)MAX_LOGLEVEL; + m_level = LogTypes::MAX_LOGLEVEL; } // LogContainer 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); |