AxioDL
/
logvisor
mirror of https://github.com/AxioDL/logvisor.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MSVC noexcept fix

This commit is contained in:
Jack Andersen 2015-07-22 09:06:24 -10:00
parent 403e2549ee
commit 085920205b
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/LogVisor/LogVisor.hpp
View File

@ -36,7 +36,11 @@ public:
std::wstring_convert<std::codecvt_utf8<wchar_t>> conv; std::wstring_convert<std::codecvt_utf8<wchar_t>> conv;
m_what.assign(conv.to_bytes(buf)); m_what.assign(conv.to_bytes(buf));
} }
#if _MSC_VER
inline const char* what() const {return m_what.c_str();}
#else
inline const char* what() const noexcept {return m_what.c_str();} inline const char* what() const noexcept {return m_what.c_str();}
#endif
}; };
/** /**

15
lib/LogVisor.cpp
View File

@ -1,6 +1,7 @@
#if _WIN32 #if _WIN32
#define _WIN32_LEAN_AND_MEAN 1 #define _WIN32_LEAN_AND_MEAN 1
#include <windows.h> #include <windows.h>
#define snprintf _snprintf
#endif #endif
#include <chrono> #include <chrono>
@ -19,6 +20,10 @@
#define BOLD "\x1b[1m" #define BOLD "\x1b[1m"
#define NORMAL "\x1b[0m" #define NORMAL "\x1b[0m"
#if _WIN32
#define FOREGROUND_WHITE FOREGROUND_RED|FOREGROUND_GREEN|FOREGROUND_BLUE
#endif
namespace LogVisor namespace LogVisor
{ {
@ -94,7 +99,7 @@ struct ConsoleLogger : public ILogger
thrName = ThreadMap[thrId]; thrName = ThreadMap[thrId];
#if _WIN32 #if _WIN32
SetConsoleTextAttribute(Term, FOREGROUND_INTENSITY); SetConsoleTextAttribute(Term, FOREGROUND_INTENSITY | FOREGROUND_WHITE);
fprintf(stderr, "["); fprintf(stderr, "[");
SetConsoleTextAttribute(Term, FOREGROUND_INTENSITY | FOREGROUND_GREEN); SetConsoleTextAttribute(Term, FOREGROUND_INTENSITY | FOREGROUND_GREEN);
fprintf(stderr, "%5.4f ", tmd); fprintf(stderr, "%5.4f ", tmd);
@ -103,7 +108,7 @@ struct ConsoleLogger : public ILogger
switch (severity) switch (severity)
{ {
case Info: case Info:
SetConsoleTextAttribute(Term, FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_BLUE); SetConsoleTextAttribute(Term, FOREGROUND_INTENSITY | FOREGROUND_GREEN | FOREGROUND_BLUE);
fprintf(stderr, "INFO"); fprintf(stderr, "INFO");
break; break;
case Warning: case Warning:
@ -121,7 +126,7 @@ struct ConsoleLogger : public ILogger
default: default:
break; break;
}; };
SetConsoleTextAttribute(Term, FOREGROUND_INTENSITY); SetConsoleTextAttribute(Term, FOREGROUND_INTENSITY | FOREGROUND_WHITE);
fprintf(stderr, " %s", modName); fprintf(stderr, " %s", modName);
SetConsoleTextAttribute(Term, FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_GREEN); SetConsoleTextAttribute(Term, FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_GREEN);
if (sourceInfo) if (sourceInfo)
@ -129,9 +134,9 @@ struct ConsoleLogger : public ILogger
SetConsoleTextAttribute(Term, FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_BLUE); SetConsoleTextAttribute(Term, FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_BLUE);
if (thrName) if (thrName)
fprintf(stderr, " (%s)", thrName); fprintf(stderr, " (%s)", thrName);
SetConsoleTextAttribute(Term, FOREGROUND_INTENSITY); SetConsoleTextAttribute(Term, FOREGROUND_INTENSITY | FOREGROUND_WHITE);
fprintf(stderr, "] "); fprintf(stderr, "] ");
SetConsoleTextAttribute(Term, 0); SetConsoleTextAttribute(Term, FOREGROUND_WHITE);
#else #else
if (XtermColor) if (XtermColor)
{ {