Mercurial > jwe > octave

comparison liboctave/array/PermMatrix.h @ 21134:2e5c1f766ac9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
provide replacement hints for deprecated C++ functions * oct-conf-post.in.h (OCTAVE_DEPRECATED): Accept message argument. * error.h, errwarn.h, gripes.h, symtab.h, variables.h, * ov-base-sparse.h, ov-base.h, ov.h, Array.h, DiagArray2.h, * PermMatrix.h, Range.h, Sparse.h, dSparse.h, lo-array-errwarn.h, * lo-array-gripes.h, unwind-prot.h: Change all uses of OCTAVE_DEPRECATED.
author John W. Eaton <jwe@octave.org>
date Fri, 22 Jan 2016 12:15:12 -0500
parents 54527108599a
children a83e7a384ee0
comparison
equal deleted inserted replaced
21133:31674b9d202b 21134:2e5c1f766ac9
35 35
36 PermMatrix (void) : Array<octave_idx_type> () { } 36 PermMatrix (void) : Array<octave_idx_type> () { }
37 37
38 PermMatrix (octave_idx_type n); 38 PermMatrix (octave_idx_type n);
39 39
40 OCTAVE_DEPRECATED PermMatrix (const Array<octave_idx_type>& p); 40 OCTAVE_DEPRECATED ("use 'PermMatrix (p, false, true)' instead")
41 PermMatrix (const Array<octave_idx_type>& p);
41 42
42 PermMatrix (const Array<octave_idx_type>& p, bool colp, bool check = true); 43 PermMatrix (const Array<octave_idx_type>& p, bool colp, bool check = true);
43 44
44 PermMatrix (const PermMatrix& m) : Array<octave_idx_type> (m) { } 45 PermMatrix (const PermMatrix& m) : Array<octave_idx_type> (m) { }
45 46
46 OCTAVE_DEPRECATED PermMatrix (const idx_vector& idx); 47 OCTAVE_DEPRECATED ("use 'PermVector (idx, false, 0)' instead")
48 PermMatrix (const idx_vector& idx);
47 49
48 PermMatrix (const idx_vector& idx, bool colp, octave_idx_type n = 0); 50 PermMatrix (const idx_vector& idx, bool colp, octave_idx_type n = 0);
49 51
50 octave_idx_type dim1 (void) const 52 octave_idx_type dim1 (void) const
51 { return Array<octave_idx_type>::numel (); } 53 { return Array<octave_idx_type>::numel (); }
59 octave_idx_type perm_length (void) const 61 octave_idx_type perm_length (void) const
60 { return Array<octave_idx_type>::numel (); } 62 { return Array<octave_idx_type>::numel (); }
61 // FIXME: a dangerous ambiguity? 63 // FIXME: a dangerous ambiguity?
62 octave_idx_type length (void) const 64 octave_idx_type length (void) const
63 { return perm_length (); } 65 { return perm_length (); }
64 OCTAVE_DEPRECATED octave_idx_type nelem (void) const { return numel (); } 66
67 OCTAVE_DEPRECATED ("use 'numel' instead")
68 octave_idx_type nelem (void) const { return numel (); }
69
65 octave_idx_type numel (void) const { return dim1 () * dim2 (); } 70 octave_idx_type numel (void) const { return dim1 () * dim2 (); }
66 71
67 size_t byte_size (void) const 72 size_t byte_size (void) const
68 { return Array<octave_idx_type>::byte_size (); } 73 { return Array<octave_idx_type>::byte_size (); }
69 74