Mercurial > octave

comparison liboctave/array/Array.h @ 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 3d25f9f4a62b f3f8e1d3e399
children 53728df3e4c9
comparison
equal deleted inserted replaced
21571:feac06371be1 21574:ae4d7dfea337
149 dimensions.chop_trailing_singletons (); 149 dimensions.chop_trailing_singletons ();
150 } 150 }
151 151
152 private: 152 private:
153 153
154 typename Array<T>::ArrayRep *nil_rep (void) const 154 static typename Array<T>::ArrayRep *nil_rep (void);
155 {
156 // NR was originally allocated with new, but that does not seem
157 // to be necessary since it will never be deleted. So just use
158 // a static object instead.
159
160 static typename Array<T>::ArrayRep nr;
161 return &nr;
162 }
163 155
164 protected: 156 protected:
165 157
166 //! For jit support 158 //! For jit support
167 Array (T *sdata, octave_idx_type slen, octave_idx_type *adims, void *arep) 159 Array (T *sdata, octave_idx_type slen, octave_idx_type *adims, void *arep)