# HG changeset patch
# User Jaroslav Hajek <highegg@gmail.com>
# Date 1237987790 -3600
# Node ID 3b1908b586621e81a9b704500881eca2267884a6
# Parent  9f5e095555fc93563702e4ef05baea4436ece035
fixes in mixed int64-double multiply emulation

diff -r 9f5e095555fc -r 3b1908b58662 liboctave/ChangeLog
--- a/liboctave/ChangeLog	Wed Mar 25 11:40:06 2009 +0100
+++ b/liboctave/ChangeLog	Wed Mar 25 14:29:50 2009 +0100
@@ -1,3 +1,8 @@
+2009-03-25  Jaroslav Hajek  <highegg@gmail.com>
+	
+	* oct-inttypes.cc (INT_DOUBLE_BINOP_DECL (*, uint64),
+	INT_DOUBLE_BINOP_DECL (*, int64)): x -> y where appropriate.
+
 2009-03-25  Jaroslav Hajek  <highegg@gmail.com>
 
 	* Array.cc (rec_permute_helper::use_blk): New field.
diff -r 9f5e095555fc -r 3b1908b58662 liboctave/oct-inttypes.cc
--- a/liboctave/oct-inttypes.cc	Wed Mar 25 11:40:06 2009 +0100
+++ b/liboctave/oct-inttypes.cc	Wed Mar 25 14:29:50 2009 +0100
@@ -407,7 +407,7 @@
     {
       return x / octave_uint64 (static_cast<uint64_t> (2));
     }
-  else if (y < 0 || xisnan (x) || xisinf (x))
+  else if (y < 0 || xisnan (y) || xisinf (y))
     {
       return octave_uint64 (x.value () * y); 
     }
@@ -442,7 +442,7 @@
     {
       return x / octave_int64 (static_cast<uint64_t> (4*y));
     }
-  else if (xisnan (x) || xisinf (x))
+  else if (xisnan (y) || xisinf (y))
     {
       return octave_int64 (x.value () * y); 
     }