From: Richard Heck <rgheck@lyx.org>
Date: Sat, 16 Dec 2017 14:22:41 +0000 (-0500)
Subject: Revert "Fix #10863 compiler warnings."
X-Git-Tag: lyx-2.4.0dev-acb2ca7b~4200
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=0a87aa02474ef15adb18d82043b9f32726c9cc8a;p=features.git

Revert "Fix #10863 compiler warnings."

This reverts commit b684ec39eaaf7d5b0270bf8109b8e281fa8c5d9f.
---

diff --git a/src/mathed/MathParser.cpp b/src/mathed/MathParser.cpp
index c914a6a55d..35062caefe 100644
--- a/src/mathed/MathParser.cpp
+++ b/src/mathed/MathParser.cpp
@@ -744,6 +744,7 @@ docstring Parser::parse_verbatim_option()
 	skipSpaces();
 	docstring res;
 	if (nextToken().character() == '[') {
+		Token t = getToken();
 		for (Token t = getToken(); t.character() != ']' && good(); t = getToken()) {
 			if (t.cat() == catBegin) {
 				putback();
@@ -761,6 +762,7 @@ docstring Parser::parse_verbatim_item()
 	skipSpaces();
 	docstring res;
 	if (nextToken().cat() == catBegin) {
+		Token t = getToken();
 		for (Token t = getToken(); t.cat() != catEnd && good(); t = getToken()) {
 			if (t.cat() == catBegin) {
 				putback();
@@ -1035,10 +1037,10 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags,
 		else if (t.cat() == catComment) {
 			docstring s;
 			while (good()) {
-				Token const & tt = getToken();
-				if (tt.cat() == catNewline)
+				Token const & t = getToken();
+				if (t.cat() == catNewline)
 					break;
-				s += tt.asInput();
+				s += t.asInput();
 			}
 			cell->push_back(MathAtom(new InsetMathComment(buf, s)));
 			skipSpaces();
@@ -1772,7 +1774,7 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags,
 			docstring s;
 			int num_tokens = 0;
 			while (true) {
-				Token const & tt = getToken();
+				Token const & t = getToken();
 				++num_tokens;
 				if (!good()) {
 					s.clear();
@@ -1780,7 +1782,7 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags,
 						putback();
 					break;
 				}
-				s += tt.character();
+				s += t.character();
 				if (isValidLength(to_utf8(s)))
 					break;
 			}