Mercurial > jwe > octave
diff libinterp/octave-value/ov-str-mat.h @ 31143:b3ca7f891750
maint: use "m_" prefix for member variables in class octave_base_matrix.
* ov-base-int.cc, ov-base-mat.cc, ov-base-mat.h, ov-base.h, ov-bool-mat.cc,
ov-bool-mat.h, ov-cell.cc, ov-cell.h, ov-ch-mat.cc, ov-ch-mat.h, ov-cx-mat.cc,
ov-cx-mat.h, ov-flt-cx-mat.cc, ov-flt-cx-mat.h, ov-flt-re-mat.cc,
ov-flt-re-mat.h, ov-intx.h, ov-re-mat.cc, ov-re-mat.h, ov-str-mat.cc,
ov-str-mat.h:
use "m_" prefix for member variables in class octave_base_matrix.
| author | Rik <rik@octave.org> |
|---|---|
| date | Sun, 10 Jul 2022 18:26:24 -0700 |
| parents | 796f54d4ddbf |
| children |
line wrap: on
line diff
--- a/libinterp/octave-value/ov-str-mat.h Sun Jul 10 17:34:12 2022 +0200 +++ b/libinterp/octave-value/ov-str-mat.h Sun Jul 10 18:26:24 2022 -0700 @@ -98,13 +98,13 @@ { return do_index_op_internal (idx, resize_ok); } octave_value squeeze (void) const - { return octave_value (charNDArray (matrix.squeeze ())); } + { return octave_value (charNDArray (m_matrix.squeeze ())); } octave_value reshape (const dim_vector& new_dims) const - { return octave_value (charNDArray (matrix.reshape (new_dims))); } + { return octave_value (charNDArray (m_matrix.reshape (new_dims))); } octave_value permute (const Array<int>& vec, bool inv = false) const - { return octave_value (charNDArray (matrix.permute (vec, inv))); } + { return octave_value (charNDArray (m_matrix.permute (vec, inv))); } octave_value resize (const dim_vector& dv, bool fill = false) const; @@ -114,7 +114,7 @@ using octave_char_matrix::diag; octave_value diag (octave_idx_type k = 0) const - { return octave_value (matrix.diag (k)); } + { return octave_value (m_matrix.diag (k)); } bool is_string (void) const { return true; } @@ -141,11 +141,11 @@ Array<std::string> cellstr_value (void) const; octave_value sort (octave_idx_type dim = 0, sortmode mode = ASCENDING) const - { return octave_value (matrix.sort (dim, mode)); } + { return octave_value (m_matrix.sort (dim, mode)); } octave_value sort (Array<octave_idx_type>& sidx, octave_idx_type dim = 0, sortmode mode = ASCENDING) const - { return octave_value (matrix.sort (sidx, dim, mode)); } + { return octave_value (m_matrix.sort (sidx, dim, mode)); } bool print_as_scalar (void) const { return (rows () <= 1); } @@ -172,7 +172,7 @@ int write (octave::stream& os, int block_size, oct_data_conv::data_type output_type, int skip, octave::mach_info::float_format flt_fmt) const - { return os.write (matrix, block_size, output_type, skip, flt_fmt); } + { return os.write (m_matrix, block_size, output_type, skip, flt_fmt); } protected: @@ -229,17 +229,17 @@ { return new octave_char_matrix_sq_str (); } octave_value squeeze (void) const - { return octave_value (charNDArray (matrix.squeeze ()), '\''); } + { return octave_value (charNDArray (m_matrix.squeeze ()), '\''); } octave_value reshape (const dim_vector& new_dims) const - { return octave_value (charNDArray (matrix.reshape (new_dims)), '\''); } + { return octave_value (charNDArray (m_matrix.reshape (new_dims)), '\''); } octave_value permute (const Array<int>& vec, bool inv = false) const - { return octave_value (charNDArray (matrix.permute (vec, inv)), '\''); } + { return octave_value (charNDArray (m_matrix.permute (vec, inv)), '\''); } octave_value resize (const dim_vector& dv, bool = false) const { - charNDArray retval (matrix); + charNDArray retval (m_matrix); retval.resize (dv); return octave_value (retval, '\''); } @@ -250,7 +250,7 @@ using octave_char_matrix_str::diag; octave_value diag (octave_idx_type k = 0) const - { return octave_value (matrix.diag (k), '\''); } + { return octave_value (m_matrix.diag (k), '\''); } bool is_sq_string (void) const { return true; } @@ -259,11 +259,11 @@ { return do_index_op_internal (idx, resize_ok, '\''); } octave_value sort (octave_idx_type dim = 0, sortmode mode = ASCENDING) const - { return octave_value (matrix.sort (dim, mode), '\''); } + { return octave_value (m_matrix.sort (dim, mode), '\''); } octave_value sort (Array<octave_idx_type>& sidx, octave_idx_type dim = 0, sortmode mode = ASCENDING) const - { return octave_value (matrix.sort (sidx, dim, mode), '\''); } + { return octave_value (m_matrix.sort (sidx, dim, mode), '\''); } private: