diff options
| author | gatecat <gatecat@ds0.me> | 2021-06-03 09:04:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-03 09:04:34 +0100 |
| commit | a3d8b4f9d198226ec0903e34a8d290b376b45c0b (patch) | |
| tree | ada2c6a5d48e766fa523e633aaa28179baea3273 /common/log.h | |
| parent | 589ca8ded5da2012e4388a3ec4c8fae74dff75e4 (diff) | |
| parent | dcbb322447a7fb59cabe197ec1dd2307acfa3681 (diff) | |
| download | nextpnr-a3d8b4f9d198226ec0903e34a8d290b376b45c0b.tar.gz nextpnr-a3d8b4f9d198226ec0903e34a8d290b376b45c0b.tar.bz2 nextpnr-a3d8b4f9d198226ec0903e34a8d290b376b45c0b.zip | |
Merge pull request #718 from YosysHQ/gatecat/hashlib
Moving from unordered_{map, set} to hashlib
Diffstat (limited to 'common/log.h')
| -rw-r--r-- | common/log.h | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/common/log.h b/common/log.h index 7dfdf165..e9237446 100644 --- a/common/log.h +++ b/common/log.h @@ -26,8 +26,8 @@ #include <stdarg.h> #include <stdio.h> #include <string> -#include <unordered_map> #include <vector> +#include "hashlib.h" #include "nextpnr_namespaces.h" NEXTPNR_NAMESPACE_BEGIN @@ -51,13 +51,19 @@ enum class LogLevel ALWAYS_MSG }; +struct loglevel_hash_ops +{ + static inline bool cmp(LogLevel a, LogLevel b) { return a == b; } + static inline unsigned int hash(LogLevel a) { return unsigned(a); } +}; + extern std::vector<std::pair<std::ostream *, LogLevel>> log_streams; extern log_write_type log_write_function; extern std::string log_last_error; extern void (*log_error_atexit)(); extern bool had_nonfatal_error; -extern std::unordered_map<LogLevel, int> message_count_by_level; +extern dict<LogLevel, int, loglevel_hash_ops> message_count_by_level; std::string stringf(const char *fmt, ...); std::string vstringf(const char *fmt, va_list ap); @@ -83,14 +89,4 @@ static inline void log_assert_worker(bool cond, const char *expr, const char *fi NEXTPNR_NAMESPACE_END -namespace std { -template <> struct hash<NEXTPNR_NAMESPACE_PREFIX LogLevel> -{ - std::size_t operator()(const NEXTPNR_NAMESPACE_PREFIX LogLevel &loglevel) const noexcept - { - return std::hash<int>()((int)loglevel); - } -}; -} // namespace std - #endif |