Mercurial > hg > octave-max

changeset 9184:9861b3ec72a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix bug in double
author Jaroslav Hajek <highegg@gmail.com>
date Wed, 06 May 2009 09:55:26 +0200
parents 94ae487acd1b
children 1e5c11890f85
files src/ChangeLog src/ov-re-mat.cc
diffstat 2 files changed, 10 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-06  Jaroslav Hajek  <highegg@gmail.com>
+
+	* ov-re-mat.cc (Fdouble): Fix order of branches.
+
 2009-05-05  John Swensen  <jpswensen@comcast.net>
 
 	* debug.h, debug.cc (breakpoints): Rename from bp_map, use a
--- a/src/ov-re-mat.cc
+++ b/src/ov-re-mat.cc
@@ -850,13 +850,13 @@
   // inside their own scopes, and we don't declare retval here to
   // avoid a shadowed declaration warning.
 
-  if (args(0).is_perm_matrix ())
+  if (args.length () == 1)
     {
-      OCTAVE_TYPE_CONV_BODY3 (double, octave_perm_matrix, octave_scalar);
-    }
-  else if (args.length () == 1)
-    {
-      if (args(0).is_diag_matrix ())
+      if (args(0).is_perm_matrix ())
+        {
+          OCTAVE_TYPE_CONV_BODY3 (double, octave_perm_matrix, octave_scalar);
+        }
+      else if (args(0).is_diag_matrix ())
         {
 	  if (args(0).is_complex_type ())
 	    {