Mercurial > hg > octave-lyh

changeset 9013:3b1908b58662

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixes in mixed int64-double multiply emulation
author Jaroslav Hajek <highegg@gmail.com>
date Wed, 25 Mar 2009 14:29:50 +0100
parents 9f5e095555fc
children 71fca0fc2436
files liboctave/ChangeLog liboctave/oct-inttypes.cc
diffstat 2 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -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.
--- a/liboctave/oct-inttypes.cc
+++ b/liboctave/oct-inttypes.cc
@@ -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); 
     }