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

astyle formatting 

[ci skip]
This commit is contained in:
Daniel Marjamäki 2019-09-03 06:43:08 +02:00
parent 88d194214f
commit af449779f0
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/token.h
View File

@ -1225,8 +1225,12 @@ public:
void scopeInfo(std::shared_ptr<ScopeInfo2> newScopeInfo); void scopeInfo(std::shared_ptr<ScopeInfo2> newScopeInfo);
std::shared_ptr<ScopeInfo2> scopeInfo() const; std::shared_ptr<ScopeInfo2> scopeInfo() const;
void setCpp11init(bool cpp11init) const { mImpl->mCpp11init=cpp11init ? TokenImpl::Cpp11init::CPP11INIT : TokenImpl::Cpp11init::NOINIT; } void setCpp11init(bool cpp11init) const {
TokenImpl::Cpp11init isCpp11init() const { return mImpl->mCpp11init; } mImpl->mCpp11init=cpp11init ? TokenImpl::Cpp11init::CPP11INIT : TokenImpl::Cpp11init::NOINIT;
}
TokenImpl::Cpp11init isCpp11init() const {
return mImpl->mCpp11init;
}
}; };
/// @} /// @}

2
lib/tokenlist.cpp
View File

@ -552,7 +552,7 @@ static bool iscpp11init_impl(const Token * const tok)
{ {
const Token *nameToken = tok; const Token *nameToken = tok;
while (nameToken && nameToken->str() == "{") { while (nameToken && nameToken->str() == "{") {
if(nameToken->isCpp11init() != TokenImpl::Cpp11init::UNKNOWN) if (nameToken->isCpp11init() != TokenImpl::Cpp11init::UNKNOWN)
return nameToken->isCpp11init() == TokenImpl::Cpp11init::CPP11INIT; return nameToken->isCpp11init() == TokenImpl::Cpp11init::CPP11INIT;
nameToken = nameToken->previous(); nameToken = nameToken->previous();
if (nameToken && nameToken->str() == "," && Token::simpleMatch(nameToken->previous(), "} ,")) if (nameToken && nameToken->str() == "," && Token::simpleMatch(nameToken->previous(), "} ,"))