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 8e69d2bfb0e0f964a0a2b69bd1d3bfd7fcbb3452..e2683fcf29100c77a7bd314cdc4b089b36a37d9b 100644 (file)
--- 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 0a899b692c8cd4324ef27373f54497ef2d8c2097..5c6cbc9d3c6325d0a1257c756210d01db793e363 100644 (file)
--- 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 c3f64eea5e54b562a07dd35936cd40fb0dd9a58e..d641de67f4937bfa8c7357a88c0a97b172ddc556 100644 (file)
--- 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,
        ///