Index: PDL-2.4.1/Basic/Core/Core.xs.PL =================================================================== --- PDL-2.4.1.orig/Basic/Core/Core.xs.PL 2004-12-06 00:32:06.000000000 +0100 +++ PDL-2.4.1/Basic/Core/Core.xs.PL 2004-12-12 22:05:11.000000000 +0100 @@ -463,11 +463,11 @@ CODE: setflag(self->state,PDL_INPLACE,val); -int +long address(self) pdl *self; CODE: - RETVAL = (int) self; + RETVAL = (long) self; OUTPUT: RETVAL Index: PDL-2.4.1/IO/Dumper.pm =================================================================== --- PDL-2.4.1.orig/IO/Dumper.pm 2003-01-17 09:27:26.000000000 +0100 +++ PDL-2.4.1/IO/Dumper.pm 2004-12-12 23:41:27.544945320 +0100 @@ -149,7 +149,7 @@ my($s) = Data::Dumper->Dump([@_]); my(%pdls); # Find the bless(...,'PDL') lines - while($s =~ s/bless\( do\{\\\(my \$o \= (\d+)\)\}\, \'PDL\' \)/\$PDL_$1/) { + while($s =~ s/bless\( do\{\\\(my \$o \= '?(\d+)'?\)\}\, \'PDL\' \)/\$PDL_$1/) { $pdls{$1}++; } Index: PDL-2.4.1/Lib/GSL/INTERP/gsl_interp.pd =================================================================== --- PDL-2.4.1.orig/Lib/GSL/INTERP/gsl_interp.pd 2003-03-12 21:10:50.000000000 +0100 +++ PDL-2.4.1/Lib/GSL/INTERP/gsl_interp.pd 2004-12-12 22:16:43.000000000 +0100 @@ -255,7 +255,7 @@ pp_def('init_meat', Pars => 'double x(n); double y(n);', - OtherPars => 'int spl', + OtherPars => 'long spl', Doc => undef, Code =>' GSLERR(gsl_spline_init,( (gsl_spline *) $COMP(spl), $P(x),$P(y),$SIZE(n)));' @@ -280,14 +280,14 @@ pp_def('eval_meat', Pars => 'double x(); double [o] out();', - OtherPars => 'int spl;int acc;', + OtherPars => 'long spl;long acc;', Doc => undef, Code =>' GSLERR(gsl_spline_eval_e,( (gsl_spline *) $COMP(spl), $x(), (gsl_interp_accel *) $COMP(acc), $P(out))); '); pp_def('eval_meat_ext', Pars => 'double x(); double [o] out();', - OtherPars => 'int spl;int acc;', + OtherPars => 'long spl;long acc;', Doc => undef, Code =>' $out() = gsl_spline_eval( (gsl_spline *) $COMP(spl), $x(), (gsl_interp_accel *) $COMP(acc)); @@ -314,14 +314,14 @@ pp_def('eval_deriv_meat', Pars => 'double x(); double [o] out();', - OtherPars => 'int spl;int acc;', + OtherPars => 'long spl;long acc;', Doc => undef, Code =>' GSLERR(gsl_spline_eval_deriv_e,( (gsl_spline *) $COMP(spl), $x(), (gsl_interp_accel *) $COMP(acc), $P(out))); '); pp_def('eval_deriv_meat_ext', Pars => 'double x(); double [o] out();', - OtherPars => 'int spl;int acc;', + OtherPars => 'long spl;long acc;', Doc => undef, Code =>' $out() = gsl_spline_eval_deriv( (gsl_spline *) $COMP(spl), $x(), (gsl_interp_accel *) $COMP(acc)); @@ -346,14 +346,14 @@ pp_def('eval_deriv2_meat', Pars => 'double x(); double [o] out();', - OtherPars => 'int spl;int acc;', + OtherPars => 'long spl;long acc;', Doc => undef, Code =>' GSLERR(gsl_spline_eval_deriv2_e,( (gsl_spline *) $COMP(spl), $x(), (gsl_interp_accel *) $COMP(acc), $P(out))); '); pp_def('eval_deriv2_meat_ext', Pars => 'double x(); double [o] out();', - OtherPars => 'int spl;int acc;', + OtherPars => 'long spl;long acc;', Doc => undef, Code =>' $out() = gsl_spline_eval_deriv2( (gsl_spline *) $COMP(spl), $x(), (gsl_interp_accel *) $COMP(acc)); @@ -378,14 +378,14 @@ pp_def('eval_integ_meat', Pars => 'double a(); double b(); double [o] out();', - OtherPars => 'int spl;int acc;', + OtherPars => 'long spl;long acc;', Doc => undef, Code =>' GSLERR(gsl_spline_eval_integ_e,( (gsl_spline *) $COMP(spl), $a(), $b(), (gsl_interp_accel *) $COMP(acc),$P(out))); '); pp_def('eval_integ_meat_ext', Pars => 'double a(); double b(); double [o] out();', - OtherPars => 'int spl;int acc;', + OtherPars => 'long spl;long acc;', Doc => undef, Code =>' $out() = gsl_spline_eval_integ( (gsl_spline *) $COMP(spl), $a(), $b(), (gsl_interp_accel *) $COMP(acc)); Index: PDL-2.4.1/Lib/GSL/RNG/gsl_random.pd =================================================================== --- PDL-2.4.1.orig/Lib/GSL/RNG/gsl_random.pd 2002-12-02 17:58:34.000000000 +0100 +++ PDL-2.4.1/Lib/GSL/RNG/gsl_random.pd 2004-12-12 22:53:48.536580656 +0100 @@ -676,7 +676,7 @@ 'gsl_get_uniform_meat', Pars => '[o]a()', GenericTypes => [F,D], - OtherPars => 'int rng', + OtherPars => 'long rng', Code => ' $a() = gsl_rng_uniform((gsl_rng *) $COMP(rng));'); @@ -684,21 +684,21 @@ 'gsl_get_uniform_pos_meat', Pars => '[o]a()', GenericTypes => [F,D], - OtherPars => 'int rng', + OtherPars => 'long rng', Code => ' $a() = gsl_rng_uniform_pos((gsl_rng *) $COMP(rng));'); pp_defnd( 'gsl_get_meat', Pars => '[o]a()', - OtherPars => 'int rng', + OtherPars => 'long rng', Code => ' $a() = gsl_rng_get((gsl_rng *) $COMP(rng));'); pp_defnd( 'gsl_get_int_meat', Pars => '[o]a()', - OtherPars => 'int n; int rng', + OtherPars => 'int n; long rng', Code => ' $a() = gsl_rng_uniform_int((gsl_rng *) $COMP(rng),$COMP(n));'); @@ -709,21 +709,21 @@ my ($pars1,$fcall1,$arglist); if ($npar==1) { - $pars1='double a; int rng'; + $pars1='double a; long rng'; $fcall1='$COMP(a)'; $arglist='$a,'; $pars2='a()'; $fcall2='$a()'; } if ($npar==2) { - $pars1='double a; double b; int rng'; + $pars1='double a; double b; long rng'; $fcall1='$COMP(a),$COMP(b)'; $arglist='$a,$b,'; $pars2='a();b()'; $fcall2='$a(),$b()'; } if ($npar==3) { - $pars1='double a; double b; double c; int rng'; + $pars1='double a; double b; double c; long rng'; $fcall1='$COMP(a),$COMP(b),$COMP(c)'; $arglist='$a,$b,$c,'; $pars2='a();b();c()'; @@ -757,7 +757,7 @@ pp_defnd( 'ran_' . $name . '_var_meat', Pars => $pars2 . ';[o]x()', - OtherPars => 'int rng', + OtherPars => 'long rng', Code =>' $x() = gsl_ran_' . $name . '((gsl_rng *) $COMP(rng),' . $fcall2 . ');'); @@ -793,7 +793,7 @@ # pp_defnd( # 'ran_' . $name . '_feed_meat', # Pars => '[o]x()', -# OtherPars => 'int rng', +# OtherPars => 'long rng', # Code =>' #$x() = gsl_ran_' . $name . '((gsl_rng *) $COMP(rng), $x());'); @@ -848,7 +848,7 @@ pp_defnd( 'ran_additive_gaussian_meat', Pars => ';[o]x()', - OtherPars => 'double sigma; int rng', + OtherPars => 'double sigma; long rng', Code =>'$x() += gsl_ran_gaussian((gsl_rng *) $COMP(rng), $COMP(sigma));'); pp_addpm(' @@ -867,7 +867,7 @@ pp_defnd( 'ran_additive_poisson_meat', Pars => ';[o]x()', - OtherPars => 'double sigma; int rng', + OtherPars => 'double sigma; long rng', Code =>'$x() += gsl_ran_poisson((gsl_rng *) $COMP(rng), $COMP(sigma));'); pp_addpm(' @@ -886,7 +886,7 @@ pp_defnd( 'ran_feed_poisson_meat', Pars => ';[o]x()', - OtherPars => 'int rng', + OtherPars => 'long rng', Code =>'$x() = gsl_ran_poisson((gsl_rng *) $COMP(rng), $x());'); pp_addpm(' @@ -905,7 +905,7 @@ pp_defnd( 'ran_bivariate_gaussian_meat', Pars => ';[o]x(n)', - OtherPars => 'double sigma_x; double sigma_y; double rho; int rng', + OtherPars => 'double sigma_x; double sigma_y; double rho; long rng', Code =>' double xx,yy; gsl_ran_bivariate_gaussian((gsl_rng *) $COMP(rng), $COMP(sigma_x), $COMP(sigma_y),$COMP(rho), &xx, &yy); @@ -930,7 +930,7 @@ pp_defnd( 'ran_dir_2d_meat', Pars => ';[o]x(n)', - OtherPars => 'int rng', + OtherPars => 'long rng', Code =>' double xx,yy; gsl_ran_dir_2d((gsl_rng *) $COMP(rng), &xx, &yy); @@ -941,7 +941,7 @@ pp_defnd( 'ran_dir_3d_meat', Pars => ';[o]x(n)', - OtherPars => 'int rng', + OtherPars => 'long rng', Code =>' double xx,yy,zz; gsl_ran_dir_3d((gsl_rng *) $COMP(rng), &xx, &yy, &zz); @@ -955,7 +955,7 @@ pp_defnd( 'ran_dir_nd_meat', Pars => ';[o]x(n)', - OtherPars => 'int ns => n; int rng', + OtherPars => 'int ns => n; long rng', Code =>' double xxx[' . $MAX_DIMENSIONS .']; gsl_ran_dir_nd((gsl_rng *) $COMP(rng), $COMP(ns), xxx); @@ -981,7 +981,7 @@ pp_defnd( 'ran_discrete_meat', Pars => ';[o]x()', - OtherPars => 'int rng_discrete; int rng', + OtherPars => 'long rng_discrete; long rng', Code =>' $x()=gsl_ran_discrete((gsl_rng *) $COMP(rng), (gsl_ran_discrete_t *) $COMP(rng_discrete)); '); @@ -1035,7 +1035,7 @@ pp_defnd( 'ran_ver_meat', Pars => ';[o]x(n)', - OtherPars => 'double x0; double r;int ns => n; int rng', + OtherPars => 'double x0; double r;int ns => n; long rng', Code =>' double xx=$COMP(x0); @@ -1044,7 +1044,7 @@ pp_defnd( 'ran_caos_meat', Pars => ';[o]x(n)', - OtherPars => 'double m; int ns => n; int rng', + OtherPars => 'double m; int ns => n; long rng', Code =>' double xx=gsl_ran_gaussian((gsl_rng *) $COMP(rng),0.1)+0.5;