From: André Pönitz Date: Tue, 8 Jan 2002 13:31:14 +0000 (+0000) Subject: more small patches X-Git-Tag: 1.6.10~20072 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=75408c2bcc975d89fa1730c43ba54513a34cb437;p=features.git more small patches git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3313 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/src/mathed/math_hullinset.C b/src/mathed/math_hullinset.C index 8e69d2bfb0..e2683fcf29 100644 --- a/src/mathed/math_hullinset.C +++ b/src/mathed/math_hullinset.C @@ -37,7 +37,7 @@ namespace { // returns position of first relation operator in the array // used for "intelligent splitting" - int firstRelOp(MathArray const & ar) + MathArray::size_type firstRelOp(MathArray const & ar) { for (MathArray::const_iterator it = ar.begin(); it != ar.end(); ++it) if ((*it)->isRelOp()) diff --git a/src/mathed/math_parser.C b/src/mathed/math_parser.C index 0a899b692c..5c6cbc9d3c 100644 --- a/src/mathed/math_parser.C +++ b/src/mathed/math_parser.C @@ -93,7 +93,7 @@ namespace { bool stared(string const & s) { - unsigned const n = s.size(); + string::size_type const n = s.size(); return n && s[n - 1] == '*'; } @@ -504,7 +504,7 @@ bool Parser::parse_lines(MathAtom & t, bool numbered, bool outmost) return false; } - int const cols = p->ncols(); + MathInset::col_type const cols = p->ncols(); // save global variables bool const saved_num = curr_num_; @@ -519,7 +519,7 @@ bool Parser::parse_lines(MathAtom & t, bool numbered, bool outmost) curr_label_.erase(); // reading a row - for (int col = 0; col < cols; ++col) { + for (MathInset::col_type col = 0; col < cols; ++col) { //lyxerr << "reading cell " << row << " " << col << "\n"; parse_into(p->cell(col + row * cols), FLAG_BLOCK); diff --git a/src/mathed/math_parser.h b/src/mathed/math_parser.h index c3f64eea5e..d641de67f4 100644 --- a/src/mathed/math_parser.h +++ b/src/mathed/math_parser.h @@ -34,7 +34,7 @@ class LyXLex; enum MathTokenEnum { /// - LM_TK_SYM, + LM_TK_SYM = 256, /// LM_TK_BOX, ///