diff options
| author | archshift <admin@archshift.com> | 2015-01-10 22:07:50 +0100 |
|---|---|---|
| committer | archshift <admin@archshift.com> | 2015-01-10 23:32:10 +0100 |
| commit | 228843c43e21ce4d3ca5fe0adc96fcb34505446b (patch) | |
| tree | b965681736fca204e49ea6f2c130409814c3006a /src/common | |
| parent | Merge pull request #458 from yuriks/cmake-debug (diff) | |
| download | yuzu-228843c43e21ce4d3ca5fe0adc96fcb34505446b.tar yuzu-228843c43e21ce4d3ca5fe0adc96fcb34505446b.tar.gz yuzu-228843c43e21ce4d3ca5fe0adc96fcb34505446b.tar.bz2 yuzu-228843c43e21ce4d3ca5fe0adc96fcb34505446b.tar.lz yuzu-228843c43e21ce4d3ca5fe0adc96fcb34505446b.tar.xz yuzu-228843c43e21ce4d3ca5fe0adc96fcb34505446b.tar.zst yuzu-228843c43e21ce4d3ca5fe0adc96fcb34505446b.zip | |
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/common.h | 7 | ||||
| -rw-r--r-- | src/common/log.h | 2 | ||||
| -rw-r--r-- | src/common/logging/log.h | 23 |
3 files changed, 8 insertions, 24 deletions
diff --git a/src/common/common.h b/src/common/common.h index bf48ae667..3246c7797 100644 --- a/src/common/common.h +++ b/src/common/common.h @@ -11,13 +11,6 @@ #include <cstdio> #include <cstring> -// Force enable logging in the right modes. For some reason, something had changed -// so that debugfast no longer logged. -#if defined(_DEBUG) || defined(DEBUGFAST) -#undef LOGGING -#define LOGGING 1 -#endif - #define STACKALIGN // An inheritable class to disallow the copy constructor and operator= functions diff --git a/src/common/log.h b/src/common/log.h index 667f2fbb9..b397cf14d 100644 --- a/src/common/log.h +++ b/src/common/log.h @@ -14,7 +14,7 @@ #endif #endif -#if _DEBUG +#ifdef _DEBUG #define _dbg_assert_(_t_, _a_) \ if (!(_a_)) {\ LOG_CRITICAL(_t_, "Error...\n\n Line: %d\n File: %s\n Time: %s\n\nIgnore and continue?", \ diff --git a/src/common/logging/log.h b/src/common/logging/log.h index bda3d633a..3d94bf0d9 100644 --- a/src/common/logging/log.h +++ b/src/common/logging/log.h @@ -74,17 +74,6 @@ enum class Class : ClassType { }; /** - * Level below which messages are simply discarded without buffering regardless of the display - * settings. - */ -const Level MINIMUM_LEVEL = -#ifdef _DEBUG - Level::Trace; -#else - Level::Debug; -#endif - -/** * Logs a message to the global logger. This proxy exists to avoid exposing the details of the * Logger class, including the ConcurrentRingBuffer template, to all files that desire to log * messages, reducing unecessary recompilations. @@ -103,13 +92,15 @@ void LogMessage(Class log_class, Level log_level, } // namespace Log #define LOG_GENERIC(log_class, log_level, ...) \ - do { \ - if (::Log::Level::log_level >= ::Log::MINIMUM_LEVEL) \ - ::Log::LogMessage(::Log::Class::log_class, ::Log::Level::log_level, \ - __FILE__, __LINE__, __func__, __VA_ARGS__); \ - } while (0) + ::Log::LogMessage(::Log::Class::log_class, ::Log::Level::log_level, \ + __FILE__, __LINE__, __func__, __VA_ARGS__) +#ifdef _DEBUG #define LOG_TRACE( log_class, ...) LOG_GENERIC(log_class, Trace, __VA_ARGS__) +#else +#define LOG_TRACE( log_class, ...) (void(0)) +#endif + #define LOG_DEBUG( log_class, ...) LOG_GENERIC(log_class, Debug, __VA_ARGS__) #define LOG_INFO( log_class, ...) LOG_GENERIC(log_class, Info, __VA_ARGS__) #define LOG_WARNING( log_class, ...) LOG_GENERIC(log_class, Warning, __VA_ARGS__) |