Mercurial > octave-nkf

comparison libinterp/octave-value/ov-ch-mat.h @ 20287:7fa170cc14fe stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
20286:c4f436483e49 20287:7fa170cc14fe
34 34
35 #include "error.h" 35 #include "error.h"
36 #include "ov.h" 36 #include "ov.h"
37 #include "ov-base.h" 37 #include "ov-base.h"
38 #include "ov-base-mat.h" 38 #include "ov-base-mat.h"
39 #include "ov-int64.h"
39 #include "ov-re-mat.h" 40 #include "ov-re-mat.h"
40 #include "ov-typeinfo.h" 41 #include "ov-typeinfo.h"
41 42
42 class octave_value_list; 43 class octave_value_list;
43 44
103 { return double_value (frc_str_conv); } 104 { return double_value (frc_str_conv); }
104 105
105 float float_scalar_value (bool frc_str_conv = false) const 106 float float_scalar_value (bool frc_str_conv = false) const
106 { return float_value (frc_str_conv); } 107 { return float_value (frc_str_conv); }
107 108
109 octave_int64 int64_scalar_value () const;
110 octave_uint64 uint64_scalar_value () const;
111
108 Matrix matrix_value (bool = false) const 112 Matrix matrix_value (bool = false) const
109 { return Matrix (charMatrix (matrix)); } 113 { return Matrix (charMatrix (matrix)); }
110 114
111 FloatMatrix float_matrix_value (bool = false) const 115 FloatMatrix float_matrix_value (bool = false) const
112 { return FloatMatrix (charMatrix (matrix)); } 116 { return FloatMatrix (charMatrix (matrix)); }