Mercurial > octave-nkf
comparison src/ov.cc @ 14469:29aabe9b37a2
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 | eff4a5933e28 |
| children | 8c988dabbe8e |
comparison
equal
deleted
inserted
replaced
| 14468:d16638f73691 | 14469:29aabe9b37a2 |
|---|---|
| 1529 octave_idx_type nel = dv.numel (); | 1529 octave_idx_type nel = dv.numel (); |
| 1530 | 1530 |
| 1531 if (retval.length () > 2 || (retval(0) != 1 && retval(1) != 1)) | 1531 if (retval.length () > 2 || (retval(0) != 1 && retval(1) != 1)) |
| 1532 { | 1532 { |
| 1533 if (!force_vector_conversion) | 1533 if (!force_vector_conversion) |
| 1534 gripe_implicit_conversion ("Octave:array-as-vector", | 1534 gripe_implicit_conversion ("Octave:array-to-vector", |
| 1535 my_type.c_str (), wanted_type.c_str ()); | 1535 my_type.c_str (), wanted_type.c_str ()); |
| 1536 retval = dim_vector (nel, 1); | 1536 retval = dim_vector (nel, 1); |
| 1537 } | 1537 } |
| 1538 | 1538 |
| 1539 return retval; | 1539 return retval; |