aboutsummaryrefslogtreecommitdiffhomepage
path: root/lexers/LexCPP.cxx
diff options
context:
space:
mode:
authorJannick <unknown>2017-08-28 17:07:27 +1000
committerJannick <unknown>2017-08-28 17:07:27 +1000
commit120a40308f90d265ffae9fe15a330f9a0962335e (patch)
tree0a424a2087287d77cb858ca566ecd9f7ac95f2ee /lexers/LexCPP.cxx
parent1903438d3c87909942d9d314cd6d2e2d7f5d37ca (diff)
downloadscintilla-mirror-120a40308f90d265ffae9fe15a330f9a0962335e.tar.gz
Backport: Bug [#1966]. "defined A" removes "A" before replacing "defined" with value.
Backport of changeset 6382:f5aebab4fb4b.
Diffstat (limited to 'lexers/LexCPP.cxx')
-rw-r--r--lexers/LexCPP.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/lexers/LexCPP.cxx b/lexers/LexCPP.cxx
index 5761d45f5..5a198d9e4 100644
--- a/lexers/LexCPP.cxx
+++ b/lexers/LexCPP.cxx
@@ -1522,6 +1522,7 @@ void LexerCPP::EvaluateTokens(std::vector<std::string> &tokens, const SymbolTabl
if (it != preprocessorDefinitions.end()) {
val = "1";
}
+ tokens.erase(tokens.begin() + i + 1, tokens.begin() + i + 2);
}
tokens[i] = val;
} else {