diff options
| author | Francois Ferrand <thetypz@gmail.com> | 2012-03-16 14:10:46 +0100 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@nokia.com> | 2012-03-19 10:33:14 +0100 |
| commit | 3e9105e40150a413b65d21588a468e7914697bcc (patch) | |
| tree | 073bc7a8655781c58fd1aea3c04a0262710a52eb /src/libs/cplusplus/pp-macro-expander.cpp | |
| parent | ffd58c577a273cd650180e527a2abcff4d8c7df2 (diff) | |
| download | qt-creator-3e9105e40150a413b65d21588a468e7914697bcc.tar.gz | |
Preprocessor: fix handling of first empty argument.
First empty argument used to be dropped: e.g. MACRO(,test) would be
expanded with one parameter only, with value 'test'.
Change-Id: I693fbb7faf1360f62266fa04c4b39c2de0d159a7
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
Diffstat (limited to 'src/libs/cplusplus/pp-macro-expander.cpp')
| -rw-r--r-- | src/libs/cplusplus/pp-macro-expander.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/cplusplus/pp-macro-expander.cpp b/src/libs/cplusplus/pp-macro-expander.cpp index 87c7b25e24..3aa53c7d7e 100644 --- a/src/libs/cplusplus/pp-macro-expander.cpp +++ b/src/libs/cplusplus/pp-macro-expander.cpp @@ -369,7 +369,7 @@ const char *MacroExpander::expand(const char *__first, const char *__last, MacroExpander expand_actual (env, frame); const char *arg_end = skip_argument_variadics (actuals, macro, arg_it, __last); - if (arg_it != arg_end) + if (arg_it != arg_end || (arg_end != __last && *arg_end == ',')) { actuals_ref.append(MacroArgumentReference(start_offset + (arg_it-start), arg_end - arg_it)); const QByteArray actual (arg_it, arg_end - arg_it); |