Some small fixes to compile with DEC cxx

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@439 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 800151f1ddcf5531d601cbd44c1721748ccb6c83..fa156c30f03b4140e813fd6595686e9ffb4c7d89 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-01-24  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * src/kbmap.C (getsym): set return type to unsigned long, as
+       declared in header. On an alpha, long is _not_ the same as int.
+
+       * src/support/LOstream.h: add a "using std::flush;"
+
 2000-01-21  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
        * src/bufferlist.C (write): use blinding fast file copy instead of

diff --git a/src/kbmap.C b/src/kbmap.C
index 858edad8b0b55268d5fbc4326668bb8cfb09da56..03cf38538f74a4a937582e5c58ff26a93fec650f 100644 (file)
--- a/src/kbmap.C
+++ b/src/kbmap.C
@@ -274,7 +274,7 @@ void kb_sequence::delseq()
    Returns   : keysym
 \* ---F------------------------------------------------------------------- */
 
-KeySym kb_sequence::getsym()
+unsigned long kb_sequence::getsym()
 {
        int l = length;
        if(l == 0) return NoSymbol;

diff --git a/src/support/LOstream.h b/src/support/LOstream.h
index 2db23aeeba3661b3d5d1fbf6fb1883f30eb821d7..7b44bb7ae26dfab8b1ac035fce0f800ae9b77d8b 100644 (file)
--- a/src/support/LOstream.h
+++ b/src/support/LOstream.h
@@ -21,5 +21,6 @@
 
 using std::ostream;
 using std::endl; 
+using std::flush;
 
 #endif