# HG changeset patch # User Jaroslav Hajek # Date 1285134058 -7200 # Node ID a046d03e2417ab0bc2c68eae54d029b3da76e254 # Parent 9478b216752e3bd3c6e3a57682ba748fb0cb5b72 slight simplifications in xpow.cc diff --git a/src/ChangeLog b/src/ChangeLog --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-09-22 Jaroslav Hajek + + * xpow.cc (elem_xpow (float, const NDArray&), + elem_xpow (float, const FloatNDArray&)): Use simpler tests. + 2010-09-21 John W. Eaton * oct-stream.h (octave_base_stream::file_number): Return 0, 1, diff --git a/src/xpow.cc b/src/xpow.cc --- 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 ());