# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1272433282 14400
# Node ID ec3cec8277dfd5dc71167eb0affd87a114d247d1
# Parent  9f55d3ce490af3168a3f57e4784002dd28ecf2c4
fixes for --enable-64

diff -r 9f55d3ce490a -r ec3cec8277df liboctave/ChangeLog
--- a/liboctave/ChangeLog	Tue Apr 27 21:54:41 2010 -0400
+++ b/liboctave/ChangeLog	Wed Apr 28 01:41:22 2010 -0400
@@ -1,3 +1,10 @@
+2010-04-28  John W. Eaton  <jwe@octave.org>
+
+	* dim-vector.h (dim_vector (const octave_idx_type *, size_t)): Delete.
+	* Sparse.cc (Sparse<T>::assign): Cast 0 to octave_idx_type in
+	call to Sparse<T> constructor.
+	Addresses bug #29692.
+
 2010-04-27  John W. Eaton  <jwe@octave.org>
 
 	* intNDArray.cc (intNDArray<T>::abs, intNDArray<T>::signum):
diff -r 9f55d3ce490a -r ec3cec8277df liboctave/Sparse.cc
--- a/liboctave/Sparse.cc	Tue Apr 27 21:54:41 2010 -0400
+++ b/liboctave/Sparse.cc	Wed Apr 28 01:41:22 2010 -0400
@@ -1813,7 +1813,9 @@
               idx.copy_data (new_ri.fortran_vec () + nz);
               new_data.assign (idx_vector (nz, new_nz), rhs.array_value ());
               // ... reassembly.
-              *this = Sparse<T> (new_data, new_ri, 0, nr, nc, false);
+              *this = Sparse<T> (new_data, new_ri,
+                                 static_cast<octave_idx_type> (0),
+                                 nr, nc, false);
             }
         }
       else
diff -r 9f55d3ce490a -r ec3cec8277df liboctave/dim-vector.h
--- a/liboctave/dim-vector.h	Tue Apr 27 21:54:41 2010 -0400
+++ b/liboctave/dim-vector.h	Wed Apr 28 01:41:22 2010 -0400
@@ -174,13 +174,6 @@
 #undef ASSIGN_REP
 #undef DIM_VECTOR_CTOR
 
-  dim_vector (const octave_idx_type *vec, size_t vec_size)
-    : rep (newrep (vec_size))
-  {
-    for (size_t k = 0; k < vec_size; k++)
-      rep[k] = vec[k];
-  }
-
   octave_idx_type& elem (int i)
   {
 #ifdef BOUNDS_CHECKING