diff src/DLD-FUNCTIONS/rand.cc @ 5275:23b37da9fd5b

[project @ 2005-04-08 16:07:35 by jwe]
author jwe
date Fri, 08 Apr 2005 16:07:37 +0000
parents 57077d0ddc8e
children 4c8a2e4e0717
line wrap: on
line diff
--- a/src/DLD-FUNCTIONS/rand.cc	Thu Apr 07 21:51:37 2005 +0000
+++ b/src/DLD-FUNCTIONS/rand.cc	Fri Apr 08 16:07:37 2005 +0000
@@ -99,8 +99,8 @@
 	      {
 		dims.resize (2);
 
-		dims(0) = NINT (tmp.double_value ());
-		dims(1) = NINT (tmp.double_value ());
+		dims(0) = NINTbig (tmp.double_value ());
+		dims(1) = NINTbig (tmp.double_value ());
 
 		if (! error_state)
 		  goto gen_matrix;
@@ -112,19 +112,19 @@
 
 	    if (r.all_elements_are_ints ())
 	      {
-		int n = r.nelem ();
+		octave_idx_type n = r.nelem ();
 
 		dims.resize (n);
 
-		int base = NINT (r.base ());
-		int incr = NINT (r.inc ());
-		int lim = NINT (r.limit ());
+		octave_idx_type base = NINTbig (r.base ());
+		octave_idx_type incr = NINTbig (r.inc ());
+		octave_idx_type lim = NINTbig (r.limit ());
 
 		if (base < 0 || lim < 0)
 		  error ("%s: all dimensions must be nonnegative", fcn);
 		else
 		  {
-		    for (int i = 0; i < n; i++)
+		    for (octave_idx_type i = 0; i < n; i++)
 		      {
 			dims(i) = base;
 			base += incr;
@@ -143,13 +143,13 @@
 
 	    if (! error_state)
 	      {
-		int len = iv.length ();
+		octave_idx_type len = iv.length ();
 
 		dims.resize (len);
 
-		for (int i = 0; i < len; i++)
+		for (octave_idx_type i = 0; i < len; i++)
 		  {
-		    int elt = iv(i);
+		    octave_idx_type elt = iv(i);
 
 		    if (elt < 0)
 		      {
@@ -197,7 +197,7 @@
 
 	    for (int i = 0; i < nargin; i++)
 	      {
-		dims(i) = args(i).int_value ();
+		dims(i) = (octave_idx_type)args(i).int_value ();
 
 		if (error_state)
 		  {