From 9350e13396b3624b81ce9fb8dd3bf194ec6e2c4d Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 16 Mar 2017 17:33:58 +0100 Subject: [PATCH] util: rename variable to avoid shadowing --- src/util.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util.h b/src/util.h index 87eb16c91..61dc0d366 100644 --- a/src/util.h +++ b/src/util.h @@ -80,9 +80,9 @@ template 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)