*** octave-3.0.0-modif/liboctave/idx-vector.h 2008-01-25 08:17:38.000000000 +0100 --- octave-3.0.0/liboctave/idx-vector.h 2007-11-27 04:06:10.000000000 +0100 *************** private: *** 50,56 **** idx_vector_rep (void) : data (0), len (0), num_zeros (0), num_ones (0), max_val (0), min_val (0), count (1), frozen_at_z_len (0), frozen_len (0), ! colon (0), range(0), one_zero (0), initialized (0), frozen (0), colon_equiv_checked (0), colon_equiv (0), orig_dims () { } idx_vector_rep (const ColumnVector& v); --- 50,56 ---- idx_vector_rep (void) : data (0), len (0), num_zeros (0), num_ones (0), max_val (0), min_val (0), count (1), frozen_at_z_len (0), frozen_len (0), ! colon (0), one_zero (0), initialized (0), frozen (0), colon_equiv_checked (0), colon_equiv (0), orig_dims () { } idx_vector_rep (const ColumnVector& v); *************** private: *** 61,67 **** idx_vector_rep (const intNDArray& inda) : data (0), len (inda.length ()), num_zeros (0), num_ones (0), max_val (0), min_val (0), count (1), frozen_at_z_len (0), ! frozen_len (0), colon (0), range(0), one_zero (0), initialized (0), frozen (0), colon_equiv_checked (0), colon_equiv (0), orig_dims (inda.dims ()) { --- 61,67 ---- idx_vector_rep (const intNDArray& inda) : data (0), len (inda.length ()), num_zeros (0), num_ones (0), max_val (0), min_val (0), count (1), frozen_at_z_len (0), ! frozen_len (0), colon (0), one_zero (0), initialized (0), frozen (0), colon_equiv_checked (0), colon_equiv (0), orig_dims (inda.dims ()) { *************** private: *** 95,101 **** idx_vector_rep (const octave_int& i) : data (0), len (1), num_zeros (0), num_ones (0), max_val (0), min_val (0), count (1), frozen_at_z_len (0), ! frozen_len (0), colon (0), range(0), one_zero (0), initialized (0), frozen (0), colon_equiv_checked (0), colon_equiv (0), orig_dims (1, 1) { --- 95,101 ---- idx_vector_rep (const octave_int& i) : data (0), len (1), num_zeros (0), num_ones (0), max_val (0), min_val (0), count (1), frozen_at_z_len (0), ! frozen_len (0), colon (0), one_zero (0), initialized (0), frozen (0), colon_equiv_checked (0), colon_equiv (0), orig_dims (1, 1) { *************** private: *** 119,126 **** octave_idx_type capacity (void) const { return len; } octave_idx_type length (octave_idx_type colon_len) const { return colon ? colon_len : len; } ! octave_idx_type elem (octave_idx_type n) const { return ! colon ? n : (range ? range_base + range_step*n: data[n]); } octave_idx_type checkelem (octave_idx_type n) const; octave_idx_type operator () (octave_idx_type n) const { return checkelem (n); } --- 119,125 ---- octave_idx_type capacity (void) const { return len; } octave_idx_type length (octave_idx_type colon_len) const { return colon ? colon_len : len; } ! octave_idx_type elem (octave_idx_type n) const { return colon ? n : data[n]; } octave_idx_type checkelem (octave_idx_type n) const; octave_idx_type operator () (octave_idx_type n) const { return checkelem (n); } *************** private: *** 156,162 **** octave_idx_type len; octave_idx_type num_zeros; octave_idx_type num_ones; - octave_idx_type range_base,range_step; octave_idx_type max_val; octave_idx_type min_val; --- 155,160 ---- *************** private: *** 166,172 **** octave_idx_type frozen_len; unsigned int colon : 1; - unsigned int range : 1; unsigned int one_zero : 1; unsigned int initialized : 1; unsigned int frozen : 1; --- 164,169 ----