Mercurial > octave
diff libinterp/corefcn/rand.cc @ 21782:2aef506f3fec
use namespace for lo-mappers.h functions
* lo-mappers.h, lo-mappers.cc (acos, arg, asin, atan, ceil, conj,
copysign, exp2, finite, fix, floor, imag, is_NA, is_NaN_or_NA, isinf,
isinteger, isnan, log2, max, min, mod, negative_sign, nint, nint_big,
positive_sign, rc_acos, rc_acosh, rc_asin, rc_atanh, rc_log, rc_log10,
rc_log2, rc_sqrt, real, rem, round, roundb, signbit, signum, trunc,
x_nint): Define in octave::math namespace. Deprecate old names.
Change all uses.
* oct-inttypes.h: Put round and isnan functions in octave::math
namespace and rename from xround and xisnan. Change all uses.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 25 May 2016 16:51:16 -0400 |
| parents | f4d7d0eb5b0c |
| children | aab79a1885cc |
line wrap: on
line diff
--- a/libinterp/corefcn/rand.cc Fri May 27 10:20:48 2016 -0400 +++ b/libinterp/corefcn/rand.cc Wed May 25 16:51:16 2016 -0400 @@ -148,13 +148,13 @@ { double dval = tmp.double_value (); - if (xisnan (dval)) + if (octave::math::isnan (dval)) error ("%s: NaN is invalid matrix dimension", fcn); dims.resize (2); - dims(0) = NINTbig (tmp.double_value ()); - dims(1) = NINTbig (tmp.double_value ()); + dims(0) = octave::math::nint_big (tmp.double_value ()); + dims(1) = octave::math::nint_big (tmp.double_value ()); goto gen_matrix; } @@ -169,8 +169,8 @@ dims.resize (n); - octave_idx_type base = NINTbig (r.base ()); - octave_idx_type incr = NINTbig (r.inc ()); + octave_idx_type base = octave::math::nint_big (r.base ()); + octave_idx_type incr = octave::math::nint_big (r.inc ()); for (octave_idx_type i = 0; i < n; i++) {