From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Mon, 24 Jan 2000 15:07:10 +0000 (+0000)
Subject: Some small fixes to compile with DEC cxx
X-Git-Tag: 1.6.10~22412
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=e0e62e94c490aade64a24119ce36978a383e3741;p=features.git

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 800151f1dd..fa156c30f0 100644
--- 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 858edad8b0..03cf38538f 100644
--- 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 2db23aeeba..7b44bb7ae2 100644
--- a/src/support/LOstream.h
+++ b/src/support/LOstream.h
@@ -21,5 +21,6 @@
 
 using std::ostream;
 using std::endl; 
+using std::flush;
 
 #endif