Mercurial > hg > octave-lyh

comparison src/ov-bool-sparse.cc @ 14469:29aabe9b37a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename array-as-vector, array-as-scalar warning IDs to match documentation (bug #35838) * NEWS: Note change in name of warning IDS * ov-base-diag.cc, ov-bool-mat.cc, ov-bool-sparse.cc, ov-ch-mat.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-intx.h, ov-perm.cc, ov-range.cc, ov-re-mat.cc, ov-re-sparse.cc, ov.cc: Rename array-as-vector, array-as-scalar warning IDs to array-to-vector, array-to-scalar
author Rik <octave@nomad.inbox5.com>
date Thu, 15 Mar 2012 20:03:01 -0700
parents 72c96de7a403
children 460a3c6d8bf1
comparison
equal deleted inserted replaced
14468:d16638f73691 14469:29aabe9b37a2
98 double retval = lo_ieee_nan_value (); 98 double retval = lo_ieee_nan_value ();
99 99
100 if (numel () > 0) 100 if (numel () > 0)
101 { 101 {
102 if (numel () > 1) 102 if (numel () > 1)
103 gripe_implicit_conversion ("Octave:array-as-scalar", 103 gripe_implicit_conversion ("Octave:array-to-scalar",
104 "bool sparse matrix", "real scalar"); 104 "bool sparse matrix", "real scalar");
105 105
106 retval = matrix (0, 0); 106 retval = matrix (0, 0);
107 } 107 }
108 else 108 else
119 Complex retval (tmp, tmp); 119 Complex retval (tmp, tmp);
120 120
121 if (rows () > 0 && columns () > 0) 121 if (rows () > 0 && columns () > 0)
122 { 122 {
123 if (numel () > 1) 123 if (numel () > 1)
124 gripe_implicit_conversion ("Octave:array-as-scalar", 124 gripe_implicit_conversion ("Octave:array-to-scalar",
125 "bool sparse matrix", "complex scalar"); 125 "bool sparse matrix", "complex scalar");
126 126
127 retval = matrix (0, 0); 127 retval = matrix (0, 0);
128 } 128 }
129 else 129 else