Merge branch 'master' into to_level

2018-02-05 09:52:30 -02:00
parent 8696ad8739 5ab033fba5
commit f4ffddc942
5 changed files with 24 additions and 20 deletions
--- a/include/spdlog/common.h
+++ b/include/spdlog/common.h
@@ -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