From f2bb19933aca9d40de73765d9e2f8685522a5113 Mon Sep 17 00:00:00 2001 From: Dmitry-Me Date: Fri, 8 Sep 2017 23:30:54 +0300 Subject: [PATCH] Omit repeated search --- simplecpp.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/simplecpp.cpp b/simplecpp.cpp index 4149a3f8..2b063dc2 100644 --- a/simplecpp.cpp +++ b/simplecpp.cpp @@ -1262,8 +1262,8 @@ namespace simplecpp { } else { if (!expandArg(tokens, tok, tok->location, macros, expandedmacros, parametertokens)) { bool expanded = false; - if (macros.find(tok->str) != macros.end() && expandedmacros.find(tok->str) == expandedmacros.end()) { - const std::map::const_iterator it = macros.find(tok->str); + const std::map::const_iterator it = macros.find(tok->str); + if (it != macros.end() && expandedmacros.find(tok->str) == expandedmacros.end()) { const Macro &m = it->second; if (!m.functionLike()) { m.expand(tokens, tok, macros, files);