From f6e6731598a02121be850a17a12384090b40f1ac Mon Sep 17 00:00:00 2001
From: mitchell <unknown>
Date: Mon, 6 Jan 2020 20:20:56 -0500
Subject: More synchronizing LongTerm3 with default. Ideally this covers
 anything missed during the backport process.

---
 lexers/LexCPP.cxx | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'lexers/LexCPP.cxx')

diff --git a/lexers/LexCPP.cxx b/lexers/LexCPP.cxx
index c6b52784e..81a6667bc 100644
--- a/lexers/LexCPP.cxx
+++ b/lexers/LexCPP.cxx
@@ -497,6 +497,8 @@ LexicalClass lexicalClasses[] = {
 	27, "SCE_C_ESCAPESEQUENCE", "literal string escapesequence", "Escape sequence",
 };
 
+const int sizeLexicalClasses = static_cast<int>(Sci::size(lexicalClasses));
+
 }
 
 class LexerCPP : public ILexerWithIdentity {
@@ -620,13 +622,13 @@ public:
 	}
 	int SCI_METHOD NamedStyles() override {
 		return std::max(subStyles.LastAllocated() + 1,
-			static_cast<int>(ELEMENTS(lexicalClasses))) +
+			sizeLexicalClasses) +
 			inactiveFlag;
 	}
 	const char * SCI_METHOD NameOfStyle(int style) override {
 		if (style >= NamedStyles())
 			return "";
-		if (style < static_cast<int>(ELEMENTS(lexicalClasses)))
+		if (style < sizeLexicalClasses)
 			return lexicalClasses[style].name;
 		// TODO: inactive and substyles
 		return "";
@@ -650,12 +652,12 @@ public:
 				return returnBuffer.c_str();
 			}
 		}
-		if (style < static_cast<int>(ELEMENTS(lexicalClasses)))
+		if (style < sizeLexicalClasses)
 			return lexicalClasses[style].tags;
 		if (style >= inactiveFlag) {
 			returnBuffer = "inactive ";
 			const int styleActive = style - inactiveFlag;
-			if (styleActive < static_cast<int>(ELEMENTS(lexicalClasses)))
+			if (styleActive < sizeLexicalClasses)
 				returnBuffer += lexicalClasses[styleActive].tags;
 			else
 				returnBuffer = "";
@@ -666,7 +668,7 @@ public:
 	const char * SCI_METHOD DescriptionOfStyle(int style) override {
 		if (style >= NamedStyles())
 			return "";
-		if (style < static_cast<int>(ELEMENTS(lexicalClasses)))
+		if (style < sizeLexicalClasses)
 			return lexicalClasses[style].description;
 		// TODO: inactive and substyles
 		return "";
-- 
cgit v1.2.3