From b97b3b7ef84f9ec327236ecd536687be16853786 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Fri, 21 Dec 2018 13:54:59 +0100 Subject: [PATCH] astyle formatting [ci skip] --- lib/templatesimplifier.cpp | 6 ++---- lib/token.cpp | 12 ++++-------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/lib/templatesimplifier.cpp b/lib/templatesimplifier.cpp index c8a804b8e..d38841f6f 100644 --- a/lib/templatesimplifier.cpp +++ b/lib/templatesimplifier.cpp @@ -1484,8 +1484,7 @@ bool TemplateSimplifier::simplifyNumericCalculations(Token *tok) bool TemplateSimplifier::simplifyCalculations(Token* frontToken) { bool ret = false; - if (!frontToken) - { + if (!frontToken) { frontToken = mTokenList.front(); } for (Token *tok = frontToken; tok; tok = tok->next()) { @@ -2051,8 +2050,7 @@ void TemplateSimplifier::replaceTemplateUsage( if (tok->isName() && !tok->templateSimplifierPointers().empty()) { std::list::iterator ti; for (ti = mTemplateInstantiations.begin(); ti != mTemplateInstantiations.end();) { - if (ti->token == tok) - { + if (ti->token == tok) { mTemplateInstantiations.erase(ti++); break; } else { diff --git a/lib/token.cpp b/lib/token.cpp index cc6ea4fdd..682b6e33e 100644 --- a/lib/token.cpp +++ b/lib/token.cpp @@ -235,13 +235,11 @@ void Token::swapWithNext() std::swap(mTokType, mNext->mTokType); std::swap(mFlags, mNext->mFlags); std::swap(mImpl, mNext->mImpl); - for (auto templateSimplifierPointer : mImpl->mTemplateSimplifierPointers) - { + for (auto templateSimplifierPointer : mImpl->mTemplateSimplifierPointers) { templateSimplifierPointer->token = this; } - for (auto templateSimplifierPointer : mNext->mImpl->mTemplateSimplifierPointers) - { + for (auto templateSimplifierPointer : mNext->mImpl->mTemplateSimplifierPointers) { templateSimplifierPointer->token = mNext; } if (mNext->mLink) @@ -260,8 +258,7 @@ void Token::takeData(Token *fromToken) delete mImpl; mImpl = fromToken->mImpl; fromToken->mImpl = nullptr; - for (auto templateSimplifierPointer : mImpl->mTemplateSimplifierPointers) - { + for (auto templateSimplifierPointer : mImpl->mTemplateSimplifierPointers) { templateSimplifierPointer->token = this; } mLink = fromToken->mLink; @@ -1710,8 +1707,7 @@ TokenImpl::~TokenImpl() delete mValueType; delete mValues; - for (auto templateSimplifierPointer : mTemplateSimplifierPointers) - { + for (auto templateSimplifierPointer : mTemplateSimplifierPointers) { templateSimplifierPointer->token = nullptr; } }