Mercurial > hg > octave-lyh

changeset 11287:d81b79c1bd5d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixes for --enable-64
author John W. Eaton <jwe@octave.org>
date Mon, 22 Nov 2010 03:27:41 -0500
parents f0478684bc2f
children c5e6efdbcf67
files liboctave/ChangeLog liboctave/boolSparse.cc src/ChangeLog src/defun.cc
diffstat 4 files changed, 18 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-22  John W. Eaton  <jwe@octave.org>
+
+	* boolSparse.cc (SparseBoolMatrix::sum, SparseBoolMatrix::any):
+	Cast integer idx_vector argument to octave_idx_type.
+
 2010-11-18  John W. Eaton  <jwe@octave.org>
 
 	* chMatrix.cc (charMatrix::row_as_string): Never strip trailing
--- a/liboctave/boolSparse.cc
+++ b/liboctave/boolSparse.cc
@@ -173,8 +173,9 @@
           Array<octave_idx_type> tmp (nz, 1);
           copy_or_memcpy (nz, ridx (), tmp.fortran_vec ());
           retval = Sparse<bool> (Array<bool> (1, 1, true),
-                                 idx_vector (tmp), idx_vector (0), nr, 1,
-                                 false);
+                                 idx_vector (tmp),
+                                 idx_vector (static_cast<octave_idx_type> (0)),
+                                 nr, 1, false);
         }
     }
 
@@ -221,7 +222,9 @@
           Array<octave_idx_type> tmp (nz, 1);
           copy_or_memcpy (nz, ridx (), tmp.fortran_vec ());
           retval = Sparse<double> (Array<double> (1, 1, 1.0),
-                                   idx_vector (tmp), idx_vector (0), nr, 1);
+                                   idx_vector (tmp),
+                                   idx_vector (static_cast<octave_idx_type> (0)),
+                                   nr, 1);
         }
     }
 
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-22  John W. Eaton  <jwe@octave.org>
+
+	* defun.cc (defun_isargout): Cast nout to octave_idx_type in call
+	to std::min.
+
 2010-11-21  Kai Habel  <kai.habel@gmx.de>
 
 	* DLD-FUNCTIONS/fltk-backend.cc (__fltk_uigetfile__): New function
--- a/src/defun.cc
+++ b/src/defun.cc
@@ -184,7 +184,8 @@
             isargout[k++] = false;
           else
             {
-              int l = std::min (k + p->numel (), nout);
+              int l = std::min (k + p->numel (),
+                                static_cast<octave_idx_type> (nout));
               while (k < l)
                 isargout[k++] = true;
             }