Mercurial > octave

comparison libinterp/octave-value/ov-base-scalar.cc @ 21574:ae4d7dfea337

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default.
author John W. Eaton <jwe@octave.org>
date Fri, 01 Apr 2016 12:57:49 -0400
parents 40de9f8f23a6 f3f8e1d3e399
children b6a686543080
comparison
equal deleted inserted replaced
21571:feac06371be1 21574:ae4d7dfea337
98 98
99 return retval; 99 return retval;
100 } 100 }
101 101
102 template <typename ST> 102 template <typename ST>
103 dim_vector
104 octave_base_scalar<ST>::dims (void) const
105 {
106 static dim_vector dv (1, 1);
107 return dv;
108 }
109
110 template <typename ST>
103 octave_value 111 octave_value
104 octave_base_scalar<ST>::permute (const Array<int>& vec, bool inv) const 112 octave_base_scalar<ST>::permute (const Array<int>& vec, bool inv) const
105 { 113 {
106 return Array<ST> (dim_vector (1, 1), scalar).permute (vec, inv); 114 return Array<ST> (dim_vector (1, 1), scalar).permute (vec, inv);
107 } 115 }