Mercurial > octave-nkf

diff liboctave/oct-inttypes.cc @ 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 0631d397fbe0
children 3c1762c7e787
line wrap: on
line diff
--- 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); 
     }