walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Renamed _configuration to mConfiguration

This commit is contained in:
Daniel Marjamäki 2018-06-16 21:57:48 +02:00
parent 598a984071
commit 5dc29a9a16
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/tokenize.cpp
View File

@ -1736,7 +1736,7 @@ bool Tokenizer::simplifyTokens1(const std::string &configuration)
// Fill the map mTypeSize.. // Fill the map mTypeSize..
fillTypeSizes(); fillTypeSizes();
_configuration = configuration; mConfiguration = configuration;
if (!simplifyTokenList1(list.getFiles().front().c_str())) if (!simplifyTokenList1(list.getFiles().front().c_str()))
return false; return false;
@ -7869,13 +7869,13 @@ void Tokenizer::syntaxError(const Token *tok) const
void Tokenizer::syntaxError(const Token *tok, char c) const void Tokenizer::syntaxError(const Token *tok, char c) const
{ {
printDebugOutput(0); printDebugOutput(0);
if (_configuration.empty()) if (mConfiguration.empty())
throw InternalError(tok, throw InternalError(tok,
std::string("Invalid number of character '") + c + "' when no macros are defined.", std::string("Invalid number of character '") + c + "' when no macros are defined.",
InternalError::SYNTAX); InternalError::SYNTAX);
else else
throw InternalError(tok, 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); InternalError::SYNTAX);
} }

2
lib/tokenize.h
View File

@ -876,7 +876,7 @@ private:
/** E.g. "A" for code where "#ifdef A" is true. This is used to /** E.g. "A" for code where "#ifdef A" is true. This is used to
print additional information in error situations. */ print additional information in error situations. */
std::string _configuration; std::string mConfiguration;
/** sizeof information for known types */ /** sizeof information for known types */
std::map<std::string, unsigned int> mTypeSize; std::map<std::string, unsigned int> mTypeSize;