aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/cplusplus/pp-engine.cpp
diff options
context:
space:
mode:
authorLeandro Melo <[email protected]>2012-09-05 15:16:47 +0200
committerLeandro Melo <[email protected]>2012-09-05 16:35:33 +0200
commitd1b65bbf837cfd4f8b655f55633afdcfe1ebe1e8 (patch)
tree1b04dd125c16c967a1ac6428f28927ef68091f0a /src/libs/cplusplus/pp-engine.cpp
parentc3f50e3192cc36a0ddc938565ef5af0c00788146 (diff)
C++: Discard comments in macro definitions
Task-number: QTCREATORBUG-7815 Change-Id: Id3e6b018bfd58b0f0072c637d69721a4bde1603a Reviewed-by: Orgad Shaneh <[email protected]> Reviewed-by: Eike Ziller <[email protected]>
Diffstat (limited to 'src/libs/cplusplus/pp-engine.cpp')
-rw-r--r--src/libs/cplusplus/pp-engine.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp
index 377e8c8e94e..e14a7e93b8a 100644
--- a/src/libs/cplusplus/pp-engine.cpp
+++ b/src/libs/cplusplus/pp-engine.cpp
@@ -1542,7 +1542,9 @@ void Preprocessor::handleDefineDirective(PPToken *tk)
previousOffset = tk->offset;
previousLine = tk->lineno;
- bodyTokens.push_back(*tk);
+ // Discard comments in macro definitions (keep comments flag doesn't apply here).
+ if (!tk->isComment())
+ bodyTokens.push_back(*tk);
lex(tk);
}