diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp index 56a5305d6..70e482971 100644 --- a/lib/tokenize.cpp +++ b/lib/tokenize.cpp @@ -1736,7 +1736,7 @@ bool Tokenizer::simplifyTokens1(const std::string &configuration) // Fill the map mTypeSize.. fillTypeSizes(); - _configuration = configuration; + mConfiguration = configuration; if (!simplifyTokenList1(list.getFiles().front().c_str())) return false; @@ -7869,13 +7869,13 @@ void Tokenizer::syntaxError(const Token *tok) const void Tokenizer::syntaxError(const Token *tok, char c) const { printDebugOutput(0); - if (_configuration.empty()) + if (mConfiguration.empty()) throw InternalError(tok, std::string("Invalid number of character '") + c + "' when no macros are defined.", InternalError::SYNTAX); else throw InternalError(tok, - std::string("Invalid number of character '") + c + "' when these macros are defined: '" + _configuration + "'.", + std::string("Invalid number of character '") + c + "' when these macros are defined: '" + mConfiguration + "'.", InternalError::SYNTAX); } diff --git a/lib/tokenize.h b/lib/tokenize.h index 67d5b82a2..f16483f7b 100644 --- a/lib/tokenize.h +++ b/lib/tokenize.h @@ -876,7 +876,7 @@ private: /** E.g. "A" for code where "#ifdef A" is true. This is used to print additional information in error situations. */ - std::string _configuration; + std::string mConfiguration; /** sizeof information for known types */ std::map mTypeSize;