Mercurial > hg > octave-max

changeset 11011:a046d03e2417

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
slight simplifications in xpow.cc
author Jaroslav Hajek <highegg@gmail.com>
date Wed, 22 Sep 2010 07:40:58 +0200
parents 9478b216752e
children 30b9b0a507f1
files src/ChangeLog src/xpow.cc
diffstat 2 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-22  Jaroslav Hajek  <highegg@gmail.com>
+
+	* xpow.cc (elem_xpow (float, const NDArray&),
+	elem_xpow (float, const FloatNDArray&)): Use simpler tests.
+
 2010-09-21  John W. Eaton  <jwe@octave.org>
 
 	* oct-stream.h (octave_base_stream::file_number): Return 0, 1,
--- a/src/xpow.cc
+++ b/src/xpow.cc
@@ -1117,9 +1117,7 @@
 {
   octave_value retval;
 
-  double d1, d2;
-
-  if (a < 0.0 && ! b.all_integers (d1, d2))
+  if (a < 0.0 && ! b.all_integers ())
     {
       Complex atmp (a);
       ComplexNDArray result (b.dims ());
@@ -2433,9 +2431,7 @@
 {
   octave_value retval;
 
-  float d1, d2;
-
-  if (a < 0.0 && ! b.all_integers (d1, d2))
+  if (a < 0.0 && ! b.all_integers ())
     {
       FloatComplex atmp (a);
       FloatComplexNDArray result (b.dims ());