From 5546f052effeb4be7b2fe22c477b35f1d6242522 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Fri, 29 Jul 2016 08:51:57 +0200 Subject: [PATCH] Preprocessor: the simplecpp begin() and end() has been renamed --- lib/preprocessor.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/preprocessor.cpp b/lib/preprocessor.cpp index 2b7412bc2..095ab627a 100644 --- a/lib/preprocessor.cpp +++ b/lib/preprocessor.cpp @@ -72,7 +72,7 @@ static void inlineSuppressions(const simplecpp::TokenList &tokens, Settings &_se { std::list suppressionIDs; - for (const simplecpp::Token *tok = tokens.cbegin(); tok; tok = tok->next) { + for (const simplecpp::Token *tok = tokens.cfront(); tok; tok = tok->next) { if (tok->comment) { std::istringstream iss(tok->str.substr(2)); std::string word; @@ -130,7 +130,7 @@ void Preprocessor::setDirectives(const simplecpp::TokenList &tokens1) } for (std::list::const_iterator it = list.begin(); it != list.end(); ++it) { - for (const simplecpp::Token *tok = (*it)->cbegin(); tok; tok = tok ? tok->next : nullptr) { + for (const simplecpp::Token *tok = (*it)->cfront(); tok; tok = tok ? tok->next : nullptr) { if ((tok->op != '#') || (tok->previous && tok->previous->location.line == tok->location.line)) continue; if (tok->next && tok->next->str == "endfile") @@ -236,7 +236,7 @@ static void getConfigs(const simplecpp::TokenList &tokens, std::set std::vector configs_if; std::vector configs_ifndef; - for (const simplecpp::Token *tok = tokens.cbegin(); tok; tok = tok->next) { + for (const simplecpp::Token *tok = tokens.cfront(); tok; tok = tok->next) { if (tok->op != '#' || sameline(tok->previous, tok)) continue; const simplecpp::Token *cmdtok = tok->next; @@ -289,7 +289,7 @@ std::set Preprocessor::getConfigs(const simplecpp::TokenList &token { std::set ret; ret.insert(""); - if (!tokens.cbegin()) + if (!tokens.cfront()) return ret; std::set defined; @@ -564,7 +564,7 @@ std::string Preprocessor::getcode(const simplecpp::TokenList &tokens1, const std unsigned int prevfile = 0; unsigned int line = 1; std::ostringstream ret; - for (const simplecpp::Token *tok = tokens2.cbegin(); tok; tok = tok->next) { + for (const simplecpp::Token *tok = tokens2.cfront(); tok; tok = tok->next) { if (writeLocations && tok->location.fileIndex != prevfile) { ret << "\n#line " << tok->location.line << " \"" << tok->location.file() << "\"\n"; prevfile = tok->location.fileIndex;