diff options
| author | Andre Hartmann <aha_1980@gmx.de> | 2017-09-08 21:04:12 +0200 |
|---|---|---|
| committer | André Hartmann <aha_1980@gmx.de> | 2017-09-11 08:59:05 +0000 |
| commit | 201a09b5c5b71fb6cdd242801c0af3c54061c960 (patch) | |
| tree | 695ae992888dd2678c1b3b28f542a414fea366b7 | |
| parent | 40e90cb8be7c76192c3bcb7fb4554d384375d6f2 (diff) | |
| download | qt-creator-201a09b5c5b71fb6cdd242801c0af3c54061c960.tar.gz | |
C++: Fix highlighting of "float" keyword for C files
... in the Classic Code Model.
Broken by 0d1fef41f76c04ede629406b6d15847c453f6d96
Task-number: QTCREATORBUG-18879
Change-Id: I7d0222cc81e8847827af042e89d3b75c57f5d454
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
| -rw-r--r-- | src/libs/3rdparty/cplusplus/Keywords.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/3rdparty/cplusplus/Keywords.cpp b/src/libs/3rdparty/cplusplus/Keywords.cpp index 522c131e47..9188e6e318 100644 --- a/src/libs/3rdparty/cplusplus/Keywords.cpp +++ b/src/libs/3rdparty/cplusplus/Keywords.cpp @@ -255,8 +255,8 @@ static inline int classify5(const char *s, LanguageFeatures features) } } } - else if (features.cxxEnabled && s[0] == 'f') { - if (s[1] == 'a') { + else if (s[0] == 'f') { + if (features.cxxEnabled && s[1] == 'a') { if (s[2] == 'l') { if (s[3] == 's') { if (s[4] == 'e') { |