diff options
| author | 2018-07-02 10:13:26 -0600 | |
|---|---|---|
| committer | 2018-07-02 21:45:47 -0400 | |
| commit | 638956aa81de255bf4bbd4e69a717eabf4ceadb9 (patch) | |
| tree | 5783dda790575e047fa757d8c56e11f3fffe7646 /src/common/logging | |
| parent | Merge pull request #608 from Subv/depth (diff) | |
| download | yuzu-638956aa81de255bf4bbd4e69a717eabf4ceadb9.tar.gz yuzu-638956aa81de255bf4bbd4e69a717eabf4ceadb9.tar.xz yuzu-638956aa81de255bf4bbd4e69a717eabf4ceadb9.zip | |
Rename logging macro back to LOG_*
Diffstat (limited to 'src/common/logging')
| -rw-r--r-- | src/common/logging/filter.cpp | 6 | ||||
| -rw-r--r-- | src/common/logging/log.h | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/common/logging/filter.cpp b/src/common/logging/filter.cpp index 428723dce..fdfb66696 100644 --- a/src/common/logging/filter.cpp +++ b/src/common/logging/filter.cpp | |||
| @@ -65,14 +65,14 @@ bool Filter::ParseFilterRule(const std::string::const_iterator begin, | |||
| 65 | const std::string::const_iterator end) { | 65 | const std::string::const_iterator end) { |
| 66 | auto level_separator = std::find(begin, end, ':'); | 66 | auto level_separator = std::find(begin, end, ':'); |
| 67 | if (level_separator == end) { | 67 | if (level_separator == end) { |
| 68 | NGLOG_ERROR(Log, "Invalid log filter. Must specify a log level after `:`: %s", | 68 | LOG_ERROR(Log, "Invalid log filter. Must specify a log level after `:`: %s", |
| 69 | std::string(begin, end).c_str()); | 69 | std::string(begin, end).c_str()); |
| 70 | return false; | 70 | return false; |
| 71 | } | 71 | } |
| 72 | 72 | ||
| 73 | const Level level = GetLevelByName(level_separator + 1, end); | 73 | const Level level = GetLevelByName(level_separator + 1, end); |
| 74 | if (level == Level::Count) { | 74 | if (level == Level::Count) { |
| 75 | NGLOG_ERROR(Log, "Unknown log level in filter: %s", std::string(begin, end).c_str()); | 75 | LOG_ERROR(Log, "Unknown log level in filter: %s", std::string(begin, end).c_str()); |
| 76 | return false; | 76 | return false; |
| 77 | } | 77 | } |
| 78 | 78 | ||
| @@ -83,7 +83,7 @@ bool Filter::ParseFilterRule(const std::string::const_iterator begin, | |||
| 83 | 83 | ||
| 84 | const Class log_class = GetClassByName(begin, level_separator); | 84 | const Class log_class = GetClassByName(begin, level_separator); |
| 85 | if (log_class == Class::Count) { | 85 | if (log_class == Class::Count) { |
| 86 | NGLOG_ERROR(Log, "Unknown log class in filter: %s", std::string(begin, end).c_str()); | 86 | LOG_ERROR(Log, "Unknown log class in filter: %s", std::string(begin, end).c_str()); |
| 87 | return false; | 87 | return false; |
| 88 | } | 88 | } |
| 89 | 89 | ||
diff --git a/src/common/logging/log.h b/src/common/logging/log.h index c5015531c..e96c90e16 100644 --- a/src/common/logging/log.h +++ b/src/common/logging/log.h | |||
| @@ -109,25 +109,25 @@ void FmtLogMessage(Class log_class, Level log_level, const char* filename, unsig | |||
| 109 | } // namespace Log | 109 | } // namespace Log |
| 110 | 110 | ||
| 111 | #ifdef _DEBUG | 111 | #ifdef _DEBUG |
| 112 | #define NGLOG_TRACE(log_class, ...) \ | 112 | #define LOG_TRACE(log_class, ...) \ |
| 113 | ::Log::FmtLogMessage(::Log::Class::log_class, ::Log::Level::Trace, __FILE__, __LINE__, \ | 113 | ::Log::FmtLogMessage(::Log::Class::log_class, ::Log::Level::Trace, __FILE__, __LINE__, \ |
| 114 | __func__, __VA_ARGS__) | 114 | __func__, __VA_ARGS__) |
| 115 | #else | 115 | #else |
| 116 | #define NGLOG_TRACE(log_class, fmt, ...) (void(0)) | 116 | #define LOG_TRACE(log_class, fmt, ...) (void(0)) |
| 117 | #endif | 117 | #endif |
| 118 | 118 | ||
| 119 | #define NGLOG_DEBUG(log_class, ...) \ | 119 | #define LOG_DEBUG(log_class, ...) \ |
| 120 | ::Log::FmtLogMessage(::Log::Class::log_class, ::Log::Level::Debug, __FILE__, __LINE__, \ | 120 | ::Log::FmtLogMessage(::Log::Class::log_class, ::Log::Level::Debug, __FILE__, __LINE__, \ |
| 121 | __func__, __VA_ARGS__) | 121 | __func__, __VA_ARGS__) |
| 122 | #define NGLOG_INFO(log_class, ...) \ | 122 | #define LOG_INFO(log_class, ...) \ |
| 123 | ::Log::FmtLogMessage(::Log::Class::log_class, ::Log::Level::Info, __FILE__, __LINE__, \ | 123 | ::Log::FmtLogMessage(::Log::Class::log_class, ::Log::Level::Info, __FILE__, __LINE__, \ |
| 124 | __func__, __VA_ARGS__) | 124 | __func__, __VA_ARGS__) |
| 125 | #define NGLOG_WARNING(log_class, ...) \ | 125 | #define LOG_WARNING(log_class, ...) \ |
| 126 | ::Log::FmtLogMessage(::Log::Class::log_class, ::Log::Level::Warning, __FILE__, __LINE__, \ | 126 | ::Log::FmtLogMessage(::Log::Class::log_class, ::Log::Level::Warning, __FILE__, __LINE__, \ |
| 127 | __func__, __VA_ARGS__) | 127 | __func__, __VA_ARGS__) |
| 128 | #define NGLOG_ERROR(log_class, ...) \ | 128 | #define LOG_ERROR(log_class, ...) \ |
| 129 | ::Log::FmtLogMessage(::Log::Class::log_class, ::Log::Level::Error, __FILE__, __LINE__, \ | 129 | ::Log::FmtLogMessage(::Log::Class::log_class, ::Log::Level::Error, __FILE__, __LINE__, \ |
| 130 | __func__, __VA_ARGS__) | 130 | __func__, __VA_ARGS__) |
| 131 | #define NGLOG_CRITICAL(log_class, ...) \ | 131 | #define LOG_CRITICAL(log_class, ...) \ |
| 132 | ::Log::FmtLogMessage(::Log::Class::log_class, ::Log::Level::Critical, __FILE__, __LINE__, \ | 132 | ::Log::FmtLogMessage(::Log::Class::log_class, ::Log::Level::Critical, __FILE__, __LINE__, \ |
| 133 | __func__, __VA_ARGS__) | 133 | __func__, __VA_ARGS__) |