From 05e8742f5d228aa4f468895ed0ca8b4111c4f5c2 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Fri, 4 Mar 2016 10:28:28 -1000 Subject: [PATCH] Namespace refactor / symbol changes --- include/logvisor/logvisor.hpp | 14 +++++++------- lib/logvisor.cpp | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/logvisor/logvisor.hpp b/include/logvisor/logvisor.hpp index e63855b..8d71198 100644 --- a/include/logvisor/logvisor.hpp +++ b/include/logvisor/logvisor.hpp @@ -11,7 +11,7 @@ extern "C" void LogVisorBp(); -namespace LogVisor +namespace logvisor { #if _WIN32 && UNICODE @@ -29,7 +29,7 @@ enum Level Info, /**< Non-error informative message */ Warning, /**< Non-error warning message */ Error, /**< Recoverable error message */ - FatalError /**< Non-recoverable error message (throws exception) */ + Fatal /**< Non-recoverable error message (throws exception) */ }; /** @@ -122,11 +122,11 @@ void RegisterFileLogger(const wchar_t* filepath); /** * @brief This is constructed per-subsystem in a locally centralized fashon */ -class LogModule +class Module { const char* m_modName; public: - LogModule(const char* modName) : m_modName(modName) {} + Module(const char* modName) : m_modName(modName) {} /** * @brief Route new log message to centralized ILogger @@ -152,9 +152,9 @@ public: logger->report(m_modName, severity, format, apc); va_end(apc); } - if (severity == Error || severity == FatalError) + if (severity == Error || severity == Fatal) LogVisorBp(); - if (severity == FatalError) + if (severity == Fatal) abort(); else if (severity == Error) ++ErrorCount; @@ -187,7 +187,7 @@ public: va_end(apc); } - if (severity == FatalError) + if (severity == Fatal) abort(); else if (severity == Error) ++ErrorCount; diff --git a/lib/logvisor.cpp b/lib/logvisor.cpp index 8d2d891..807a906 100644 --- a/lib/logvisor.cpp +++ b/lib/logvisor.cpp @@ -37,7 +37,7 @@ void LogVisorBp() {} -namespace LogVisor +namespace logvisor { static std::unordered_map ThreadMap; @@ -157,7 +157,7 @@ struct ConsoleLogger : public ILogger case Error: fprintf(stderr, RED BOLD "ERROR"); break; - case FatalError: + case Fatal: fprintf(stderr, BOLD RED "FATAL ERROR"); break; default: @@ -229,7 +229,7 @@ struct ConsoleLogger : public ILogger case Error: fprintf(stderr, "ERROR"); break; - case FatalError: + case Fatal: fprintf(stderr, "FATAL ERROR"); break; default: @@ -347,7 +347,7 @@ struct FileLogger : public ILogger case Error: fprintf(fp, "ERROR"); break; - case FatalError: + case Fatal: fprintf(fp, "FATAL ERROR"); break; default: