Mercurial > octave

changeset 33572:c0d79d64a1b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Replace `&` with `&&` in xnorm.cc
author Arun Giridhar <arungiridhar@gmail.com>
date Sat, 11 May 2024 15:01:22 -0400
parents 742d8fc77688
children 1cfa8b20a07d a2ea7c2222b8
files libinterp/corefcn/xnorm.cc
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/xnorm.cc	Sat Apr 20 13:13:50 2024 +0200
+++ b/libinterp/corefcn/xnorm.cc	Sat May 11 15:01:22 2024 -0400
@@ -51,7 +51,7 @@
     retval = octave_value (0);
   else if (isvector)
     {
-      if (isfloat & iscomplex)
+      if (isfloat && iscomplex)
         retval = octave::xnorm (x.float_complex_column_vector_value (),
                                 p.float_value ());
       else if (isfloat)
@@ -75,7 +75,7 @@
     }
   else
     {
-      if (isfloat & iscomplex)
+      if (isfloat && iscomplex)
         retval = octave::xnorm (x.float_complex_matrix_value (),
                                 p.float_value ());
       else if (isfloat)
@@ -115,7 +115,7 @@
     }
   else
     {
-      if (isfloat & iscomplex)
+      if (isfloat && iscomplex)
         retval = octave::xcolnorms (x.float_complex_matrix_value (),
                                     p.float_value ());
       else if (isfloat)
@@ -155,7 +155,7 @@
     }
   else
     {
-      if (isfloat & iscomplex)
+      if (isfloat && iscomplex)
         retval = octave::xrownorms (x.float_complex_matrix_value (),
                                     p.float_value ());
       else if (isfloat)
@@ -193,7 +193,7 @@
     }
   else
     {
-      if (isfloat & iscomplex)
+      if (isfloat && iscomplex)
         retval = octave::xfrobnorm (x.float_complex_matrix_value ());
       else if (isfloat)
         retval = octave::xfrobnorm (x.float_matrix_value ());