Mercurial > hg > octave-nkf
comparison liboctave/boolSparse.cc @ 11287:d81b79c1bd5d
fixes for --enable-64
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 22 Nov 2010 03:27:41 -0500 |
parents | 4b51c0a20a98 |
children | fd0a3ac60b0e |
comparison
equal
deleted
inserted
replaced
11286:f0478684bc2f | 11287:d81b79c1bd5d |
---|---|
171 else | 171 else |
172 { | 172 { |
173 Array<octave_idx_type> tmp (nz, 1); | 173 Array<octave_idx_type> tmp (nz, 1); |
174 copy_or_memcpy (nz, ridx (), tmp.fortran_vec ()); | 174 copy_or_memcpy (nz, ridx (), tmp.fortran_vec ()); |
175 retval = Sparse<bool> (Array<bool> (1, 1, true), | 175 retval = Sparse<bool> (Array<bool> (1, 1, true), |
176 idx_vector (tmp), idx_vector (0), nr, 1, | 176 idx_vector (tmp), |
177 false); | 177 idx_vector (static_cast<octave_idx_type> (0)), |
178 nr, 1, false); | |
178 } | 179 } |
179 } | 180 } |
180 | 181 |
181 return retval; | 182 return retval; |
182 } | 183 } |
219 else | 220 else |
220 { | 221 { |
221 Array<octave_idx_type> tmp (nz, 1); | 222 Array<octave_idx_type> tmp (nz, 1); |
222 copy_or_memcpy (nz, ridx (), tmp.fortran_vec ()); | 223 copy_or_memcpy (nz, ridx (), tmp.fortran_vec ()); |
223 retval = Sparse<double> (Array<double> (1, 1, 1.0), | 224 retval = Sparse<double> (Array<double> (1, 1, 1.0), |
224 idx_vector (tmp), idx_vector (0), nr, 1); | 225 idx_vector (tmp), |
226 idx_vector (static_cast<octave_idx_type> (0)), | |
227 nr, 1); | |
225 } | 228 } |
226 } | 229 } |
227 | 230 |
228 return retval; | 231 return retval; |
229 } | 232 } |