Mercurial > hg > octave-nkf

diff liboctave/array/Array.h @ 19519:5b263e517c95

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove liboctave methods and classes deprecated for longer than 3 years. * Array2.h, Array3.h, ArrayN.h, MArray2.h, MArrayN.h: remove these files with their corresponding classes which have been deprecated. * numeric/lo-mappers.h, numeric/lo-mappers.cc (octave_is_NaN_or_NA): remove deprecated function for input of doubles and floats. * util/lo-ieee.h, util/lo-ieee.cc (__lo_ieee_float_is_NaN_or_NA): remove deprecated function for input of doubles and floats. * array/Array.h (Array<T>::chop_trailing_singletons): remove deprecated method. * array/Array.h (Array<T>::Array (octave_idx_type), Array<T>::Array (octave_idx_type, T)): remove deprecated constructors which casused confusions since there are no 1D arrays. * dim-vector.h (dim_vector::dim_vector (octave_idx_type)): remove deprecated constructor which caused confusion since there are no 1D arrays. * liboctave/array/module.mk: update list of files.
author Carnë Draug <carandraug@octave.org>
date Mon, 10 Nov 2014 12:37:04 +0000
parents 96751a74bbbb
children 1f4455ff2329
line wrap: on
line diff
--- a/liboctave/array/Array.h
+++ b/liboctave/array/Array.h
@@ -180,20 +180,6 @@
     rep->count++;
   }
 
-  //! Obsolete 1D ctor (there are no 1D arrays).
-  explicit Array (octave_idx_type n) GCC_ATTR_DEPRECATED
-    : dimensions (n, 1), rep (new typename Array<T>::ArrayRep (n)),
-      slice_data (rep->data), slice_len (rep->len)
-  { }
-
-  //! Obsolete initialized 1D ctor (there are no 1D arrays).
-  explicit Array (octave_idx_type n, const T& val) GCC_ATTR_DEPRECATED
-    : dimensions (n, 1), rep (new typename Array<T>::ArrayRep (n)),
-      slice_data (rep->data), slice_len (rep->len)
-  {
-    fill (val);
-  }
-
   //! nD uninitialized ctor.
   explicit Array (const dim_vector& dv)
     : dimensions (dv),
@@ -338,9 +324,6 @@
   //! Chop off leading singleton dimensions
   Array<T> squeeze (void) const;
 
-  void chop_trailing_singletons (void) GCC_ATTR_DEPRECATED
-  { dimensions.chop_trailing_singletons (); }
-
   octave_idx_type compute_index (octave_idx_type i, octave_idx_type j) const;
   octave_idx_type compute_index (octave_idx_type i, octave_idx_type j,
                                  octave_idx_type k) const;