aboutsummaryrefslogtreecommitdiffhomepage
path: root/lexers/LexCPP.cxx
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2015-05-12 12:11:46 +1000
committerNeil <nyamatongwe@gmail.com>2015-05-12 12:11:46 +1000
commitced84459c7dd731470edba244101e5578ef8bfe9 (patch)
treeeed9d6c16126f4c0110bc1672b77fe72cf115826 /lexers/LexCPP.cxx
parentef8100fc09f74722b1a0afbd7f3a5373aa23ddd5 (diff)
downloadscintilla-mirror-ced84459c7dd731470edba244101e5578ef8bfe9.tar.gz
Bug [#1719]. Fix #undef directive.
Diffstat (limited to 'lexers/LexCPP.cxx')
-rw-r--r--lexers/LexCPP.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/lexers/LexCPP.cxx b/lexers/LexCPP.cxx
index 33e7a5608..1d9e40d17 100644
--- a/lexers/LexCPP.cxx
+++ b/lexers/LexCPP.cxx
@@ -1245,11 +1245,10 @@ void SCI_METHOD LexerCPP::Lex(unsigned int startPos, int length, int initStyle,
}
} else if (sc.Match("undef")) {
if (options.updatePreprocessor && !preproc.IsInactive()) {
- std::string restOfLine = GetRestOfLine(styler, sc.currentPos + 5, true);
+ const std::string restOfLine = GetRestOfLine(styler, sc.currentPos + 5, false);
std::vector<std::string> tokens = Tokenize(restOfLine);
- std::string key;
if (tokens.size() >= 1) {
- key = tokens[0];
+ const std::string key = tokens[0];
preprocessorDefinitions.erase(key);
ppDefineHistory.push_back(PPDefinition(lineCurrent, key, "", true));
definitionsChanged = true;