From: Scott Kostyshak <skostysh@lyx.org>
Date: Fri, 1 Dec 2017 18:36:21 +0000 (-0500)
Subject: Set array length from int const
X-Git-Tag: 2.3.0rc2~197
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=e3494c2f3aadf1722d7920dec05516d93299ac6d;p=features.git

Set array length from int const

(cherry picked from commit b3f7eb6af37bcef01976a22ba422c289371365f4)
---

diff --git a/src/insets/InsetCommandParams.cpp b/src/insets/InsetCommandParams.cpp
index cae982782c..39c7715dc5 100644
--- a/src/insets/InsetCommandParams.cpp
+++ b/src/insets/InsetCommandParams.cpp
@@ -495,12 +495,13 @@ docstring InsetCommandParams::prepareCommand(OutputParams const & runparams,
 	if (handling & ParamInfo::HANDLING_INDEX_ESCAPE) {
 		// Now escape special commands
 		static docstring const quote = from_ascii("\"");
-		static char_type const chars_escape[4] = { '"', '@', '|', '!' };
+		int const nchars_escape = 4;
+		static char_type const chars_escape[nchars_escape] = { '"', '@', '|', '!' };
 
 		if (!result.empty()) {
 			// The characters in chars_name[] need to be changed to a command when
 			// they are LaTeXified.
-			for (int k = 0; k < 4; k++)
+			for (int k = 0; k < nchars_escape; k++)
 				for (size_t i = 0, pos;
 					(pos = result.find(chars_escape[k], i)) != string::npos;
 					i = pos + 2)