diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-03-17 10:28:50 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-03-17 10:29:01 +0100 |
| commit | fcf556f7e9b3b09d88aaa1377dc97f6438b2c9c6 (patch) | |
| tree | 94b4ce1d1277f1382b043062e868d1ccab161a8e | |
| parent | 32d1b344985f82796292fec80ee5621c9a268431 (diff) | |
| parent | 9350e13396b3624b81ce9fb8dd3bf194ec6e2c4d (diff) | |
| download | bitcoin-fcf556f7e9b3b09d88aaa1377dc97f6438b2c9c6.tar.xz | |
Merge #10010: util: rename variable to avoid shadowing
9350e13 util: rename variable to avoid shadowing (Pavol Rusnak)
Tree-SHA512: 8abc09fdb134c913e823754f3f02a4d8ef120a73f252fbc1217dbd2bdd4ed4fffce92d823a66d1fe51607dc021065df8826f21274ef26e55d82575e96d07224f
| -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) |