diff options
| author | Pavol Rusnak <stick@gk2.sk> | 2017-03-16 17:33:58 +0100 |
|---|---|---|
| committer | Pavol Rusnak <stick@gk2.sk> | 2017-03-16 17:33:58 +0100 |
| commit | 9350e13396b3624b81ce9fb8dd3bf194ec6e2c4d (patch) | |
| tree | 8d9f49813d3cb21eeca27f1824c0ad57b160535a /src/util.h | |
| parent | 8b789d814199f9860425f71c2dd990d6a2c56cf3 (diff) | |
util: rename variable to avoid shadowing
Diffstat (limited to 'src/util.h')
| -rw-r--r-- | src/util.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/util.h b/src/util.h index 87eb16c91b..61dc0d366c 100644 --- a/src/util.h +++ b/src/util.h @@ -80,9 +80,9 @@ template<typename... Args> std::string FormatStringFromLogArgs(const char *fmt, std::string _log_msg_; /* Unlikely name to avoid shadowing variables */ \ try { \ _log_msg_ = tfm::format(__VA_ARGS__); \ - } catch (tinyformat::format_error &e) { \ + } catch (tinyformat::format_error &fmterr) { \ /* Original format string will have newline so don't add one here */ \ - _log_msg_ = "Error \"" + std::string(e.what()) + "\" while formatting log message: " + FormatStringFromLogArgs(__VA_ARGS__); \ + _log_msg_ = "Error \"" + std::string(fmterr.what()) + "\" while formatting log message: " + FormatStringFromLogArgs(__VA_ARGS__); \ } \ LogPrintStr(_log_msg_); \ } while(0) |