Mercurial > jwe > octave

comparison libinterp/octave-value/ov-flt-cx-diag.cc @ 30143:2dca5c25237d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
undo matrix -> m_matrix changes in type names and error messages Files affected: ov-base-diag.cc, ov-cx-diag.cc, ov-flt-cx-diag.cc, ov-flt-re-diag.cc, and ov-re-diag.cc.
author John W. Eaton <jwe@octave.org>
date Wed, 08 Sep 2021 06:46:19 -0400
parents 606652e9f446
children 91c6288781ba 796f54d4ddbf
comparison
equal deleted inserted replaced
30142:14214fbfa258 30143:2dca5c25237d
38 38
39 39
40 template class octave_base_diag<FloatComplexDiagMatrix, FloatComplexMatrix>; 40 template class octave_base_diag<FloatComplexDiagMatrix, FloatComplexMatrix>;
41 41
42 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_float_complex_diag_matrix, 42 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_float_complex_diag_matrix,
43 "float complex diagonal m_matrix", "single"); 43 "float complex diagonal matrix", "single");
44 44
45 static octave_base_value * 45 static octave_base_value *
46 default_numeric_conversion_function (const octave_base_value& a) 46 default_numeric_conversion_function (const octave_base_value& a)
47 { 47 {
48 const octave_float_complex_diag_matrix& v 48 const octave_float_complex_diag_matrix& v
86 { 86 {
87 DiagMatrix retval; 87 DiagMatrix retval;
88 88
89 if (! force_conversion) 89 if (! force_conversion)
90 warn_implicit_conversion ("Octave:imag-to-real", 90 warn_implicit_conversion ("Octave:imag-to-real",
91 type_name (), "real m_matrix"); 91 type_name (), "real matrix");
92 92
93 retval = ::real (m_matrix); 93 retval = ::real (m_matrix);
94 94
95 return retval; 95 return retval;
96 } 96 }
100 { 100 {
101 DiagMatrix retval; 101 DiagMatrix retval;
102 102
103 if (! force_conversion) 103 if (! force_conversion)
104 warn_implicit_conversion ("Octave:imag-to-real", 104 warn_implicit_conversion ("Octave:imag-to-real",
105 type_name (), "real m_matrix"); 105 type_name (), "real matrix");
106 106
107 retval = ::real (m_matrix); 107 retval = ::real (m_matrix);
108 108
109 return retval; 109 return retval;
110 } 110 }