Mercurial > octave
diff libinterp/octave-value/ov-ch-mat.h @ 20252:7fa170cc14fe stable
Return correct hex value for printf when used with string inputs (bug #45263).
* oct-stream.cc (ok_for_signed_int_conv): Return true for strings.
* ov-ch-mat.cc (int64_scalar_value, uint64_scalar_value): New functions to
return int64 or uint64 values from a character matrix octave_value.
ov-ch-mat.h: (int64_scalar_value, uint64_scalar_value): Declare new functions
in header file.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 09 Jun 2015 16:25:45 -0700 |
| parents | 4197fc428c7d |
| children | f7084eae3318 |
line wrap: on
line diff
--- a/libinterp/octave-value/ov-ch-mat.h Tue Jun 09 16:16:44 2015 -0700 +++ b/libinterp/octave-value/ov-ch-mat.h Tue Jun 09 16:25:45 2015 -0700 @@ -36,6 +36,7 @@ #include "ov.h" #include "ov-base.h" #include "ov-base-mat.h" +#include "ov-int64.h" #include "ov-re-mat.h" #include "ov-typeinfo.h" @@ -105,6 +106,9 @@ float float_scalar_value (bool frc_str_conv = false) const { return float_value (frc_str_conv); } + octave_int64 int64_scalar_value () const; + octave_uint64 uint64_scalar_value () const; + Matrix matrix_value (bool = false) const { return Matrix (charMatrix (matrix)); }