Mercurial > octave
changeset 30037:8d6bdd961494
maint: use "s_" prefix for static class variables in oct-inttypes.h
* oct-inttypes.cc, oct-inttypes.h: Rename class static variables "zero" to
"s_zero" and "one" to "s_one".
| author | Rik <rik@octave.org> |
|---|---|
| date | Tue, 24 Aug 2021 19:55:44 -0700 |
| parents | 80373844f8b2 |
| children | 18fd44941006 |
| files | liboctave/util/oct-inttypes.cc liboctave/util/oct-inttypes.h |
| diffstat | 2 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/util/oct-inttypes.cc Tue Aug 24 17:54:43 2021 -0700 +++ b/liboctave/util/oct-inttypes.cc Tue Aug 24 19:55:44 2021 -0700 @@ -32,10 +32,10 @@ #include "oct-inttypes.h" template <typename T> -const octave_int<T> octave_int<T>::zero (static_cast<T> (0)); +const octave_int<T> octave_int<T>::s_zero (static_cast<T> (0)); template <typename T> -const octave_int<T> octave_int<T>::one (static_cast<T> (1)); +const octave_int<T> octave_int<T>::s_one (static_cast<T> (1)); // Define type names. @@ -595,7 +595,7 @@ dblesplit (y, sign, my, e); uint32_t w[4]; umul128 (x.value (), my, w); - octave_uint64 res = octave_uint64::zero; + octave_uint64 res = octave_uint64::s_zero; for (short i = 0; i < 4; i++) { res += octave_uint64 (dbleget (sign, w[i], e)); @@ -631,7 +631,7 @@ uint32_t w[4]; sign = (sign != (x.value () < 0)); umul128 (octave_int_abs (x.value ()), my, w); - octave_int64 res = octave_int64::zero; + octave_int64 res = octave_int64::s_zero; for (short i = 0; i < 4; i++) { res += octave_int64 (dbleget (sign, w[i], e)); @@ -707,8 +707,8 @@ { octave_int<T> retval; - const octave_int<T> zero = octave_int<T>::zero; - const octave_int<T> one = octave_int<T>::one; + const octave_int<T> zero = octave_int<T>::s_zero; + const octave_int<T> one = octave_int<T>::s_one; if (b == zero || a == one) retval = one;
--- a/liboctave/util/oct-inttypes.h Tue Aug 24 17:54:43 2021 -0700 +++ b/liboctave/util/oct-inttypes.h Tue Aug 24 19:55:44 2021 -0700 @@ -910,7 +910,7 @@ static const OCTAVE_API char * type_name (); // The following are provided for convenience. - static const octave_int zero, one; + static const octave_int s_zero, s_one; // Unsafe. This function exists to support the MEX interface. // You should not use it anywhere else.