[PATCH] 64 bit fixes

[John Levon]

This is what I needed to compile LyX on IA-64

Mostly int != long stuff.

regards
john


? a.diff
Index: src/lyxrow_funcs.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxrow_funcs.C,v
retrieving revision 1.18
diff -u -a -p -r1.18 lyxrow_funcs.C
--- src/lyxrow_funcs.C  9 Sep 2003 17:25:20 -0000       1.18
+++ src/lyxrow_funcs.C  11 Oct 2003 20:13:41 -0000
@@ -71,7 +71,7 @@ int numberOfSeparators(Paragraph const &
 {
        pos_type const last = lastPos(par, rit);
        int n = 0;
-       pos_type p = max(rit->pos(), par.beginningOfBody());
+       pos_type p = max(rit->pos(), pos_type(par.beginningOfBody()));
        for ( ; p < last; ++p)
                if (par.isSeparator(p))
                        ++n;
@@ -92,7 +92,7 @@ int numberOfHfills(Paragraph const & par
                        ++first;
        }
 
-       first = max(first, par.beginningOfBody());
+       first = max(first, pos_type(par.beginningOfBody()));
 
        int n = 0;
 
@@ -118,7 +118,7 @@ int numberOfLabelHfills(Paragraph const 
                        ++first;
        }
 
-       last = min(last, par.beginningOfBody());
+       last = min(last, pos_type(par.beginningOfBody()));
        int n = 0;
 
        // last, because the end is ignored!
Index: src/text.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/text.C,v
retrieving revision 1.458
diff -u -a -p -r1.458 text.C
--- src/text.C  10 Oct 2003 11:27:05 -0000      1.458
+++ src/text.C  11 Oct 2003 20:13:44 -0000
@@ -1985,7 +1985,7 @@ ParagraphList::iterator LyXText::getPar(
 }
 
 
-ParagraphList::iterator LyXText::getPar(int par) const
+ParagraphList::iterator LyXText::getPar(lyx::paroffset_type par) const
 {
        BOOST_ASSERT(par >= 0);
        BOOST_ASSERT(par < ownerParagraphs().size());
Index: src/frontends/xforms/XFormsMenubar.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/XFormsMenubar.C,v
retrieving revision 1.8
diff -u -a -p -r1.8 XFormsMenubar.C
--- src/frontends/xforms/XFormsMenubar.C        6 Oct 2003 15:42:57 -0000       1.8
+++ src/frontends/xforms/XFormsMenubar.C        11 Oct 2003 20:13:46 -0000
@@ -286,7 +286,7 @@ int XFormsMenubar::create_submenu(Window
                                                       *item.submenu(), smn, funcs);
                                if (submenuid == -1)
                                        return -1;
-                               label += "%x" + tostr(smn.size());
+                               label += "%x" + tostr(long(smn.size()));
                                lyxerr[Debug::GUI]
                                        << "Menu: " << submenuid
                                        << " (at index " << smn.size()
Index: src/insets/insetfloat.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetfloat.C,v
retrieving revision 1.104
diff -u -a -p -r1.104 insetfloat.C
--- src/insets/insetfloat.C     6 Oct 2003 15:43:01 -0000       1.104
+++ src/insets/insetfloat.C     11 Oct 2003 20:13:46 -0000
@@ -403,7 +403,7 @@ void InsetFloat::addToToc(lyx::toc::TocL
                if (pit->layout()->name() == caplayout) {
                        string const name = floatname(params_.type, buf.params());
                        string const str =
-                               tostr(toclist[name].size() + 1)
+                               tostr(long(toclist[name].size() + 1))
                                + ". " + pit->asString(buf, false);
                        lyx::toc::TocItem const item(pit->id(), 0 , str);
                        toclist[name].push_back(item);
Index: src/insets/insetwrap.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetwrap.C,v
retrieving revision 1.47
diff -u -a -p -r1.47 insetwrap.C
--- src/insets/insetwrap.C      6 Oct 2003 15:43:09 -0000       1.47
+++ src/insets/insetwrap.C      11 Oct 2003 20:13:47 -0000
@@ -245,7 +245,7 @@ void InsetWrap::addToToc(lyx::toc::TocLi
                if (tmp->layout()->name() == caplayout) {
                        string const name = floatname(params_.type, buf.params());
                        string const str =
-                               tostr(toclist[name].size() + 1)
+                               tostr(long(toclist[name].size() + 1))
                                + ". " + tmp->asString(buf, false);
                        lyx::toc::TocItem const item(tmp->id(), 0 , str);
                        toclist[name].push_back(item);