diff options
| author | hjk <qtc-committer@nokia.com> | 2012-04-27 17:11:16 +0200 |
|---|---|---|
| committer | hjk <qthjk@ovi.com> | 2012-05-02 00:37:11 +0200 |
| commit | 0672d873d0f4b938479de0b5fda3729f7f4dcc96 (patch) | |
| tree | d8d9ffbd0917c595a04ceb67298d123052d0c0ba /src/libs/cplusplus/pp-engine.cpp | |
| parent | c908a4b9e663f2817e55e0cfd55c658265a5527b (diff) | |
| download | qt-creator-0672d873d0f4b938479de0b5fda3729f7f4dcc96.tar.gz | |
preprocessor: concatenate tokens need to preserve previous whitespace
Change-Id: Ibca5737ad906c1db7e1bf4e15e5c92030e87c0bb
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Diffstat (limited to 'src/libs/cplusplus/pp-engine.cpp')
| -rw-r--r-- | src/libs/cplusplus/pp-engine.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp index da8fea3b99..693bcd5493 100644 --- a/src/libs/cplusplus/pp-engine.cpp +++ b/src/libs/cplusplus/pp-engine.cpp @@ -1549,7 +1549,9 @@ PPToken Preprocessor::generateConcatenated(const PPToken &leftTk, const PPToken newText.reserve(leftTk.length() + rightTk.length()); newText.append(leftTk.tokenStart(), leftTk.length()); newText.append(rightTk.tokenStart(), rightTk.length()); - return generateToken(T_IDENTIFIER, newText.constData(), newText.size(), leftTk.lineno, true); + PPToken result = generateToken(T_IDENTIFIER, newText.constData(), newText.size(), leftTk.lineno, true); + result.f.whitespace = leftTk.f.whitespace; + return result; } void Preprocessor::startSkippingBlocks(const Preprocessor::PPToken &tk) const |