Merge branch 'master' into to_level

This commit is contained in:
Fernando Gomes
2018-02-05 09:52:30 -02:00
committed by GitHub
5 changed files with 24 additions and 20 deletions

View File

@@ -112,7 +112,7 @@ inline spdlog::level::level_enum to_level_enum(const char* name)
}
return (spdlog::level::level_enum) 0;
}
using level_hasher = std::hash<int>;
} //level

View File

@@ -10,7 +10,7 @@
#include "../details/os.h"
#include <string>
#include <map>
#include <unordered_map>
namespace spdlog
{
@@ -104,7 +104,7 @@ protected:
}
FILE* target_file_;
bool should_do_colors_;
std::map<level::level_enum, std::string> colors_;
std::unordered_map<level::level_enum, std::string, level::level_hasher> colors_;
};

View File

@@ -11,7 +11,7 @@
#include <mutex>
#include <string>
#include <map>
#include <unordered_map>
#include <wincon.h>
namespace spdlog
@@ -73,7 +73,7 @@ protected:
private:
HANDLE out_handle_;
std::map<level::level_enum, WORD> colors_;
std::unordered_map<level::level_enum, WORD, level::level_hasher> colors_;
// set color and return the orig console attributes (for resetting later)
WORD set_console_attribs(WORD attribs)