diff options
| author | Neil <nyamatongwe@gmail.com> | 2017-07-17 15:40:15 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2017-07-17 15:40:15 +1000 |
| commit | 0e237487cfb370b98dd4e4d170cd4a88aced140a (patch) | |
| tree | 952db88907c176762344002c6dab4405b58541fa | |
| parent | 345d3df084f4e2d74e2a0ff5481b1e96648b0bab (diff) | |
| download | scintilla-mirror-0e237487cfb370b98dd4e4d170cd4a88aced140a.tar.gz | |
Backport: Fix signed / unsigned comparison warnings.
Backport of changeset 6354:4914db52c782.
| -rw-r--r-- | lexers/LexCPP.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lexers/LexCPP.cxx b/lexers/LexCPP.cxx index e8e3e6ca0..08a95321e 100644 --- a/lexers/LexCPP.cxx +++ b/lexers/LexCPP.cxx @@ -587,7 +587,7 @@ public: const char * SCI_METHOD NameOfStyle(int style) override { if (style >= NamedStyles()) return ""; - if (style < ELEMENTS(lexicalClasses)) + if (style < static_cast<int>(ELEMENTS(lexicalClasses))) return lexicalClasses[style].name; // TODO: inactive and substyles return ""; @@ -611,12 +611,12 @@ public: return returnBuffer.c_str(); } } - if (style < ELEMENTS(lexicalClasses)) + if (style < static_cast<int>(ELEMENTS(lexicalClasses))) return lexicalClasses[style].tags; if (style >= activeFlag) { returnBuffer = "inactive "; const int styleActive = style - activeFlag; - if (styleActive < ELEMENTS(lexicalClasses)) + if (styleActive < static_cast<int>(ELEMENTS(lexicalClasses))) returnBuffer += lexicalClasses[styleActive].tags; else returnBuffer = ""; @@ -627,7 +627,7 @@ public: const char * SCI_METHOD DescriptionOfStyle(int style) override { if (style >= NamedStyles()) return ""; - if (style < ELEMENTS(lexicalClasses)) + if (style < static_cast<int>(ELEMENTS(lexicalClasses))) return lexicalClasses[style].description; // TODO: inactive and substyles return ""; |