diff options
| author | 2016-09-21 11:29:48 -0700 | |
|---|---|---|
| committer | 2016-09-21 11:29:48 -0700 | |
| commit | d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a (patch) | |
| tree | 8a22ca73ff838f3f0090b29a548ae81087fc90ed /src/common/logging/backend.h | |
| parent | README: Specify master branch for Travis CI badge (diff) | |
| parent | Fix Travis clang-format check (diff) | |
| download | yuzu-d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a.tar.gz yuzu-d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a.tar.xz yuzu-d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a.zip | |
Merge pull request #2086 from linkmauve/clang-format
Add clang-format as part of our {commit,travis}-time checks
Diffstat (limited to 'src/common/logging/backend.h')
| -rw-r--r-- | src/common/logging/backend.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/common/logging/backend.h b/src/common/logging/backend.h index 795d42ebd..c4fe2acbf 100644 --- a/src/common/logging/backend.h +++ b/src/common/logging/backend.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #include <cstdarg> | 8 | #include <cstdarg> |
| 9 | #include <string> | 9 | #include <string> |
| 10 | #include <utility> | 10 | #include <utility> |
| 11 | |||
| 12 | #include "common/logging/log.h" | 11 | #include "common/logging/log.h" |
| 13 | 12 | ||
| 14 | namespace Log { | 13 | namespace Log { |
| @@ -44,10 +43,8 @@ const char* GetLogClassName(Class log_class); | |||
| 44 | const char* GetLevelName(Level log_level); | 43 | const char* GetLevelName(Level log_level); |
| 45 | 44 | ||
| 46 | /// Creates a log entry by formatting the given source location, and message. | 45 | /// Creates a log entry by formatting the given source location, and message. |
| 47 | Entry CreateEntry(Class log_class, Level log_level, | 46 | Entry CreateEntry(Class log_class, Level log_level, const char* filename, unsigned int line_nr, |
| 48 | const char* filename, unsigned int line_nr, const char* function, | 47 | const char* function, const char* format, va_list args); |
| 49 | const char* format, va_list args); | ||
| 50 | 48 | ||
| 51 | void SetFilter(Filter* filter); | 49 | void SetFilter(Filter* filter); |
| 52 | |||
| 53 | } | 50 | } |