1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736
|
From: Youhei SASAKI <uwabami@gfd-dennou.org>
Date: Mon, 30 Dec 2024 19:27:36 +0900
Subject: Fix gcc-14 -Wincompatible-pointer-types
Forwarded: https://github.com/SciRuby/rb-gsl/pull/73
Signed-off-by: Youhei SASAKI <uwabami@gfd-dennou.org>
---
ext/gsl_native/blas2.c | 8 ++++----
ext/gsl_native/gsl.c | 2 +-
ext/gsl_native/gsl_narray.c | 4 ++--
ext/gsl_native/histogram2d.c | 15 +++++++--------
ext/gsl_native/ieee.c | 4 ++--
ext/gsl_native/interp2d.c | 20 ++++++++++----------
ext/gsl_native/linalg.c | 38 +++++++++++++++++++-------------------
ext/gsl_native/matrix_complex.c | 2 +-
ext/gsl_native/monte.c | 2 +-
ext/gsl_native/multiroots.c | 4 ++--
ext/gsl_native/ntuple.c | 4 ++--
ext/gsl_native/odeiv.c | 2 +-
ext/gsl_native/poly_source.h | 6 +++---
ext/gsl_native/rng.c | 6 +++---
ext/gsl_native/sf_bessel.c | 2 +-
ext/gsl_native/sf_ellint.c | 4 ++--
ext/gsl_native/sf_mathieu.c | 36 ++++++++++++++++++------------------
ext/gsl_native/spline.c | 2 +-
ext/gsl_native/stats.c | 26 +++++++++++++-------------
ext/gsl_native/tamu_anova.c | 4 ++--
ext/gsl_native/vector_complex.c | 5 ++---
21 files changed, 97 insertions(+), 99 deletions(-)
diff --git a/ext/gsl_native/blas2.c b/ext/gsl_native/blas2.c
index 7063e1f..a39fe75 100644
--- a/ext/gsl_native/blas2.c
+++ b/ext/gsl_native/blas2.c
@@ -1081,8 +1081,8 @@ void Init_gsl_blas2(VALUE module)
rb_define_module_function(module, "zher!", rb_gsl_blas_zher, 4);
rb_define_module_function(module, "zher", rb_gsl_blas_zher_a, 4);
- rb_define_module_function(module, "dsyr2!", rb_gsl_blas_dsyr2, 4);
- rb_define_module_function(module, "dsyr2", rb_gsl_blas_dsyr2_a, 4);
- rb_define_module_function(module, "zher2!", rb_gsl_blas_zher2, 4);
- rb_define_module_function(module, "zher2", rb_gsl_blas_zher2_a, 4);
+ rb_define_module_function(module, "dsyr2!", rb_gsl_blas_dsyr2, 5);
+ rb_define_module_function(module, "dsyr2", rb_gsl_blas_dsyr2_a, 5);
+ rb_define_module_function(module, "zher2!", rb_gsl_blas_zher2, 5);
+ rb_define_module_function(module, "zher2", rb_gsl_blas_zher2_a, 5);
}
diff --git a/ext/gsl_native/gsl.c b/ext/gsl_native/gsl.c
index 4e771b7..043c748 100644
--- a/ext/gsl_native/gsl.c
+++ b/ext/gsl_native/gsl.c
@@ -27,7 +27,7 @@ static VALUE rb_gsl_object_inspect(VALUE obj)
return rb_str_new2(buf);
}
-static VALUE rb_gsl_call_rescue(VALUE obj)
+static VALUE rb_gsl_call_rescue(VALUE obj, VALUE error)
{
return Qfalse;
}
diff --git a/ext/gsl_native/gsl_narray.c b/ext/gsl_native/gsl_narray.c
index a4a90d9..11cc515 100644
--- a/ext/gsl_native/gsl_narray.c
+++ b/ext/gsl_native/gsl_narray.c
@@ -731,9 +731,9 @@ void Init_gsl_narray(VALUE module)
rb_define_alias(cNArray, "to_gslv_int_view", "to_gv_int_view");
/*****/
- rb_define_method(cgsl_matrix, "to_na", rb_gsl_matrix_to_na, 0);
+ rb_define_method(cgsl_matrix, "to_na", rb_gsl_matrix_to_na, 1);
rb_define_alias(cgsl_matrix, "to_narray", "to_na");
- rb_define_method(cgsl_matrix, "to_nm", rb_gsl_matrix_to_nmatrix, 0);
+ rb_define_method(cgsl_matrix, "to_nm", rb_gsl_matrix_to_nmatrix, 1);
rb_define_alias(cgsl_matrix, "to_nmatrix", "to_nm");
rb_define_method(cgsl_matrix, "to_na2", rb_gsl_matrix_to_na_ref, 0);
rb_define_alias(cgsl_matrix, "to_na_ref", "to_na2");
diff --git a/ext/gsl_native/histogram2d.c b/ext/gsl_native/histogram2d.c
index 6ad8b35..2e0fdd9 100644
--- a/ext/gsl_native/histogram2d.c
+++ b/ext/gsl_native/histogram2d.c
@@ -474,7 +474,7 @@ static VALUE rb_gsl_histogram2d_add(VALUE obj, VALUE hh2)
Need_Float(hh2);
gsl_histogram2d_shift(hnew, NUM2DBL(hh2));
}
- return Data_Wrap_Struct(CLASS_OF(h1), 0, gsl_histogram2d_free, hnew);
+ return Data_Wrap_Struct(CLASS_OF((VALUE)h1), 0, gsl_histogram2d_free, hnew);
}
static VALUE rb_gsl_histogram2d_sub(VALUE obj, VALUE hh2)
@@ -489,7 +489,7 @@ static VALUE rb_gsl_histogram2d_sub(VALUE obj, VALUE hh2)
Need_Float(hh2);
gsl_histogram2d_shift(hnew, -NUM2DBL(hh2));
}
- return Data_Wrap_Struct(CLASS_OF(h1), 0, gsl_histogram2d_free, hnew);
+ return Data_Wrap_Struct(CLASS_OF((VALUE)h1), 0, gsl_histogram2d_free, hnew);
}
static VALUE rb_gsl_histogram2d_mul(VALUE obj, VALUE hh2)
@@ -504,7 +504,7 @@ static VALUE rb_gsl_histogram2d_mul(VALUE obj, VALUE hh2)
Need_Float(hh2);
gsl_histogram2d_scale(hnew, NUM2DBL(hh2));
}
- return Data_Wrap_Struct(CLASS_OF(h1), 0, gsl_histogram2d_free, hnew);
+ return Data_Wrap_Struct(CLASS_OF((VALUE)h1), 0, gsl_histogram2d_free, hnew);
}
static VALUE rb_gsl_histogram2d_div(VALUE obj, VALUE hh2)
@@ -519,7 +519,7 @@ static VALUE rb_gsl_histogram2d_div(VALUE obj, VALUE hh2)
Need_Float(hh2);
gsl_histogram2d_scale(hnew, 1.0/NUM2DBL(hh2));
}
- return Data_Wrap_Struct(CLASS_OF(h1), 0, gsl_histogram2d_free, hnew);
+ return Data_Wrap_Struct(CLASS_OF((VALUE)h1), 0, gsl_histogram2d_free, hnew);
}
static VALUE rb_gsl_histogram2d_scale2(VALUE obj, VALUE val)
@@ -529,7 +529,7 @@ static VALUE rb_gsl_histogram2d_scale2(VALUE obj, VALUE val)
Data_Get_Struct(obj, gsl_histogram2d, h1);
hnew = gsl_histogram2d_clone(h1);
gsl_histogram2d_scale(hnew, NUM2DBL(val));
- return Data_Wrap_Struct(CLASS_OF(h1), 0, gsl_histogram2d_free, hnew);
+ return Data_Wrap_Struct(CLASS_OF((VALUE)h1), 0, gsl_histogram2d_free, hnew);
}
static VALUE rb_gsl_histogram2d_shift2(VALUE obj, VALUE val)
@@ -539,7 +539,7 @@ static VALUE rb_gsl_histogram2d_shift2(VALUE obj, VALUE val)
Data_Get_Struct(obj, gsl_histogram2d, h1);
hnew = gsl_histogram2d_clone(h1);
gsl_histogram2d_shift(hnew, NUM2DBL(val));
- return Data_Wrap_Struct(CLASS_OF(h1), 0, gsl_histogram2d_free, hnew);
+ return Data_Wrap_Struct(CLASS_OF((VALUE)h1), 0, gsl_histogram2d_free, hnew);
}
static VALUE rb_gsl_histogram2d_fwrite(VALUE obj, VALUE io)
@@ -1006,7 +1006,7 @@ void Init_gsl_histogram2d(VALUE module)
rb_define_method(cgsl_histogram2d, "fwrite2", rb_gsl_histogram2d_fwrite2, 1);
rb_define_method(cgsl_histogram2d, "fread2", rb_gsl_histogram2d_fread2, 1);
rb_define_method(cgsl_histogram2d, "fprintf", rb_gsl_histogram2d_fprintf, -1);
- rb_define_method(cgsl_histogram2d, "fscanf", rb_gsl_histogram2d_fscanf, 3);
+ rb_define_method(cgsl_histogram2d, "fscanf", rb_gsl_histogram2d_fscanf, 1);
cgsl_histogram2d_pdf = rb_define_class_under(cgsl_histogram2d, "Pdf", cGSL_Object);
@@ -1039,4 +1039,3 @@ void Init_gsl_histogram2d(VALUE module)
#ifdef CHECK_HISTOGRAM2D
#undef CHECK_HISTOGRAM2D
#endif
-
diff --git a/ext/gsl_native/ieee.c b/ext/gsl_native/ieee.c
index 1d5df16..6146138 100644
--- a/ext/gsl_native/ieee.c
+++ b/ext/gsl_native/ieee.c
@@ -81,8 +81,8 @@ void Init_gsl_ieee(VALUE module)
rb_define_singleton_method(mgsl_ieee, "fprintf",
rb_gsl_ieee_fprintf_double, -1);
rb_define_singleton_method(mgsl_ieee, "printf",
- rb_gsl_ieee_printf_double, -1);
+ rb_gsl_ieee_printf_double, 1);
rb_define_singleton_method(mgsl_ieee, "printf_double",
- rb_gsl_ieee_printf_double, -1);
+ rb_gsl_ieee_printf_double, 1);
}
diff --git a/ext/gsl_native/interp2d.c b/ext/gsl_native/interp2d.c
index e078611..dde486d 100644
--- a/ext/gsl_native/interp2d.c
+++ b/ext/gsl_native/interp2d.c
@@ -15,7 +15,7 @@ VALUE cgsl_interp2d_accel; /* this is used also in spline2d.c */
extern VALUE cgsl_vector, cgsl_matrix;
static VALUE rb_gsl_interp2d_alloc(int argc, VALUE *argv, VALUE self)
-{
+{
rb_gsl_interp2d *sp = NULL;
const gsl_interp2d_type *T = NULL;
double *xptr = NULL, *yptr = NULL, *zptr = NULL;
@@ -63,8 +63,8 @@ static VALUE rb_gsl_interp2d_init(VALUE self, VALUE xarr, VALUE yarr, VALUE zarr
}
static VALUE rb_gsl_interp_evaluate(
- VALUE self, VALUE xarr, VALUE yarr, VALUE zarr, VALUE xx, VALUE yy,
- double (*eval)(const gsl_interp2d * interp,
+ VALUE self, VALUE xarr, VALUE yarr, VALUE zarr, VALUE xx, VALUE yy,
+ double (*eval)(const gsl_interp2d * interp,
const double xa[], const double ya[], const double za[],
const double x, const double y, gsl_interp_accel * xacc,
gsl_interp_accel * yacc))
@@ -77,7 +77,7 @@ static VALUE rb_gsl_interp_evaluate(
xx = yy;
yy = temp;
}
-
+
rb_gsl_interp2d *rgi = NULL;
double *xptr = NULL, *yptr = NULL, *zptr = NULL;
gsl_vector *vx = NULL, *vy = NULL, *vnew = NULL;
@@ -89,19 +89,19 @@ static VALUE rb_gsl_interp_evaluate(
Data_Get_Struct(self, rb_gsl_interp2d, rgi);
xptr = get_vector_ptr(xarr, &stridex, &xsize);
if (xsize != rgi->p->xsize ) {
- rb_raise(rb_eTypeError, "size mismatch (xa:%d != %d)", (int) xsize,
+ rb_raise(rb_eTypeError, "size mismatch (xa:%d != %d)", (int) xsize,
(int) rgi->p->xsize);
}
yptr = get_vector_ptr(yarr, &stridey, &ysize);
if (ysize != rgi->p->ysize ) {
- rb_raise(rb_eTypeError, "size mismatch (ya:%d != %d)", (int) ysize,
+ rb_raise(rb_eTypeError, "size mismatch (ya:%d != %d)", (int) ysize,
(int) rgi->p->ysize);
}
zptr = get_vector_ptr(zarr, &stridez, &zsize);
if (zsize != xsize*ysize ) {
- rb_raise(rb_eTypeError, "size mismatch (za:%d != %d)", (int) zsize,
+ rb_raise(rb_eTypeError, "size mismatch (za:%d != %zu)", (int) zsize,
(int) xsize*ysize);
}
@@ -145,7 +145,7 @@ static VALUE rb_gsl_interp_evaluate(
vnew = gsl_vector_alloc(vx->size);
for (i = 0; i < vx->size; i++) {
- val = (*eval)(rgi->p, xptr, yptr, zptr, gsl_vector_get(vx, i),
+ val = (*eval)(rgi->p, xptr, yptr, zptr, gsl_vector_get(vx, i),
gsl_vector_get(vy, i), rgi->xacc, rgi->yacc);
gsl_vector_set(vnew, i, val);
}
@@ -199,7 +199,7 @@ static void rb_gsl_interp2d_define_const(VALUE self)
}
const gsl_interp2d_type* get_interp2d_type(VALUE t)
-{
+{
int type;
char name[32];
@@ -212,7 +212,7 @@ const gsl_interp2d_type* get_interp2d_type(VALUE t)
case 1: return gsl_interp2d_bilinear; break;
default:
rb_raise(rb_eRuntimeError, "Cannot recognize type %d.\n", type);
- }
+ }
case T_STRING:
strcpy(name, STR2CSTR(t));
diff --git a/ext/gsl_native/linalg.c b/ext/gsl_native/linalg.c
index 87d5bbc..618e394 100644
--- a/ext/gsl_native/linalg.c
+++ b/ext/gsl_native/linalg.c
@@ -92,13 +92,13 @@ static VALUE rb_gsl_linalg_LU_decomp_nmatrix(int argc, VALUE *argv, VALUE obj,
rb_raise(rb_eRuntimeError, "square matrix required");
if (flag == LINALG_DECOMP) {
- m = rb_nmatrix_dense_create(FLOAT64, input_nmatrix->shape, 2,
+ m = rb_nmatrix_dense_create(FLOAT64, input_nmatrix->shape, 2,
input_nmatrix->elements, input_nmatrix->shape[0] * input_nmatrix->shape[1]);
temp_nmatrix = NM_STORAGE_DENSE(m);
- mv = gsl_matrix_view_array((double*)temp_nmatrix->elements,
+ mv = gsl_matrix_view_array((double*)temp_nmatrix->elements,
temp_nmatrix->shape[0], temp_nmatrix->shape[1]);
} else {
- mv = gsl_matrix_view_array((double*)input_nmatrix->elements,
+ mv = gsl_matrix_view_array((double*)input_nmatrix->elements,
input_nmatrix->shape[0], input_nmatrix->shape[1]);
}
p = gsl_permutation_alloc(mv.matrix.size1);
@@ -304,7 +304,7 @@ static VALUE rb_gsl_linalg_LU_solve_nmatrix(int argc, VALUE *argv, VALUE obj)
argc);
}
input_nmatrix = NM_STORAGE_DENSE(argv[0]);
- mv = gsl_matrix_view_array((double*) input_nmatrix->elements,
+ mv = gsl_matrix_view_array((double*) input_nmatrix->elements,
input_nmatrix->shape[0], input_nmatrix->shape[1]);
CHECK_PERMUTATION(argv[1]);
Data_Get_Struct(argv[1], gsl_permutation, p);
@@ -542,11 +542,11 @@ static VALUE rb_gsl_linalg_LU_invert_nmatrix(int argc, VALUE *argv, VALUE obj)
CHECK_PERMUTATION(argv[1]);
lu_nmatrix = NM_STORAGE_DENSE(argv[0]);
- inv = rb_nmatrix_dense_create(FLOAT64, lu_nmatrix->shape, 2,
+ inv = rb_nmatrix_dense_create(FLOAT64, lu_nmatrix->shape, 2,
lu_nmatrix->elements, NM_DENSE_COUNT(argv[0]));
- mv1 = gsl_matrix_view_array((double*)lu_nmatrix->elements,
+ mv1 = gsl_matrix_view_array((double*)lu_nmatrix->elements,
lu_nmatrix->shape[0], lu_nmatrix->shape[1]);
- mv2 = gsl_matrix_view_array((double*)NM_DENSE_ELEMENTS(inv),
+ mv2 = gsl_matrix_view_array((double*)NM_DENSE_ELEMENTS(inv),
lu_nmatrix->shape[0], lu_nmatrix->shape[1]);
Data_Get_Struct(argv[1], gsl_permutation, p);
@@ -620,7 +620,7 @@ static VALUE rb_gsl_linalg_LU_det_nmatrix(int argc, VALUE *argv, VALUE obj)
/* no break */
case 1:
input_nmatrix = NM_STORAGE_DENSE(argv[0]);
- mv = gsl_matrix_view_array((double*)input_nmatrix->elements,
+ mv = gsl_matrix_view_array((double*)input_nmatrix->elements,
input_nmatrix->shape[0], input_nmatrix->shape[1]);
break;
default:
@@ -965,7 +965,7 @@ static VALUE rb_gsl_linalg_QR_decomp_nmatrix(int argc, VALUE *argv, VALUE obj)
shapem[0] = nm->shape[1];
shapem[1] = nm->shape[1];
shapev[0] = shapem[0];
- qr = rb_nmatrix_dense_create(FLOAT64, shapem, 2, nm->elements,
+ qr = rb_nmatrix_dense_create(FLOAT64, shapem, 2, nm->elements,
shapem[0]*shapem[1]);
tau = rb_nmatrix_dense_create(FLOAT64, shapev, 1, nm->elements, shapev[0]);
mv = gsl_matrix_view_array((double*)NM_DENSE_ELEMENTS(qr), shapem[0], shapem[1]);
@@ -1696,10 +1696,10 @@ static VALUE rb_gsl_linalg_R_solve(int argc, VALUE *argv, VALUE obj)
}
/* singleton */
-static VALUE rb_gsl_linalg_QR_QRsolve(int argc, VALUE *argv, VALUE obj,
- int flag)
+static VALUE rb_gsl_linalg_QR_QRsolve(VALUE argc, VALUE argv, VALUE obj,
+ VALUE flag)
{
- return rb_gsl_linalg_QRLQ_QRLQsolve(argc, argv, obj, LINALG_QR_DECOMP);
+ return rb_gsl_linalg_QRLQ_QRLQsolve((int)argc, &argv, obj, LINALG_QR_DECOMP);
}
static VALUE rb_gsl_linalg_LQ_Lsolve(int argc, VALUE *argv, VALUE obj)
@@ -1718,10 +1718,10 @@ static VALUE rb_gsl_linalg_L_solve(int argc, VALUE *argv, VALUE obj)
}
/* singleton */
-static VALUE rb_gsl_linalg_LQ_LQsolve(int argc, VALUE *argv, VALUE obj,
- int flag)
+static VALUE rb_gsl_linalg_LQ_LQsolve(VALUE argc, VALUE argv, VALUE obj,
+ VALUE flag)
{
- return rb_gsl_linalg_QRLQ_QRLQsolve(argc, argv, obj, LINALG_LQ_DECOMP);
+ return rb_gsl_linalg_QRLQ_QRLQsolve((int)argc, &argv, obj, LINALG_LQ_DECOMP);
}
static VALUE rb_gsl_linalg_QRLQ_update(VALUE obj, VALUE qq, VALUE rr, VALUE ww,
@@ -4049,12 +4049,12 @@ void Init_gsl_linalg(VALUE module)
rb_define_method(cgsl_matrix_QR, "Rsolve", rb_gsl_linalg_QR_Rsolve, -1);
rb_define_module_function(mgsl_linalg_QR, "Rsvx", rb_gsl_linalg_QR_Rsvx, -1);
- rb_define_method(cgsl_matrix_QR, "Rsvx", rb_gsl_linalg_QR_Rsvx, 1);
+ rb_define_method(cgsl_matrix_QR, "Rsvx", rb_gsl_linalg_QR_Rsvx, -1);
rb_define_module_function(mgsl_linalg_QR, "unpack", rb_gsl_linalg_QR_unpack, -1);
rb_define_method(cgsl_matrix_QR, "unpack", rb_gsl_linalg_QR_unpack, -1);
- rb_define_module_function(mgsl_linalg_QR, "QRsolve", rb_gsl_linalg_QR_QRsolve, -1);
+ rb_define_module_function(mgsl_linalg_QR, "QRsolve", rb_gsl_linalg_QR_QRsolve, 3);
rb_define_module_function(mgsl_linalg_QR, "update", rb_gsl_linalg_QR_update, 4);
rb_define_method(mgsl_linalg, "R_solve", rb_gsl_linalg_R_solve, -1);
@@ -4250,12 +4250,12 @@ void Init_gsl_linalg(VALUE module)
rb_define_method(cgsl_matrix_LQ, "Lsolve_T", rb_gsl_linalg_LQ_Lsolve, -1);
rb_define_module_function(mgsl_linalg_LQ, "Lsvx_T", rb_gsl_linalg_LQ_Lsvx, -1);
- rb_define_method(cgsl_matrix_LQ, "Lsvx_T", rb_gsl_linalg_LQ_Lsvx, 1);
+ rb_define_method(cgsl_matrix_LQ, "Lsvx_T", rb_gsl_linalg_LQ_Lsvx, -1);
rb_define_module_function(mgsl_linalg_LQ, "unpack", rb_gsl_linalg_LQ_unpack, -1);
rb_define_method(cgsl_matrix_LQ, "unpack", rb_gsl_linalg_LQ_unpack, -1);
- rb_define_module_function(mgsl_linalg_LQ, "LQsolve_T", rb_gsl_linalg_LQ_LQsolve, -1);
+ rb_define_module_function(mgsl_linalg_LQ, "LQsolve_T", rb_gsl_linalg_LQ_LQsolve, 3);
rb_define_module_function(mgsl_linalg_LQ, "update", rb_gsl_linalg_LQ_update, 4);
rb_define_method(mgsl_linalg, "L_solve_T", rb_gsl_linalg_L_solve, -1);
diff --git a/ext/gsl_native/matrix_complex.c b/ext/gsl_native/matrix_complex.c
index f8aed7b..ac80bcf 100644
--- a/ext/gsl_native/matrix_complex.c
+++ b/ext/gsl_native/matrix_complex.c
@@ -1424,7 +1424,7 @@ static VALUE rb_gsl_matrix_complex_arccoth(VALUE obj)
return rb_gsl_matrix_complex_XXX_complex(obj, gsl_complex_arccoth);
}
-static VALUE rb_gsl_matrix_complex_indgen_bang(int argc, VALUE *argv[], VALUE obj)
+static VALUE rb_gsl_matrix_complex_indgen_bang(int argc, VALUE argv[], VALUE obj)
{
gsl_matrix_complex *m = NULL;
double start = 0, step = 1, x;
diff --git a/ext/gsl_native/monte.c b/ext/gsl_native/monte.c
index 8d83bdb..1a296e3 100644
--- a/ext/gsl_native/monte.c
+++ b/ext/gsl_native/monte.c
@@ -852,7 +852,7 @@ void Init_gsl_monte(VALUE module)
rb_define_singleton_method(cgsl_monte_function, "alloc", rb_gsl_monte_function_new, -1);
rb_define_method(cgsl_monte_function, "proc", rb_gsl_monte_function_proc, 0);
- rb_define_method(cgsl_monte_function, "eval", rb_gsl_monte_function_eval, 0);
+ rb_define_method(cgsl_monte_function, "eval", rb_gsl_monte_function_eval, 1);
rb_define_alias(cgsl_monte_function, "call", "eval");
rb_define_method(cgsl_monte_function, "params", rb_gsl_monte_function_params, 0);
rb_define_method(cgsl_monte_function, "set", rb_gsl_monte_function_set_f, -1);
diff --git a/ext/gsl_native/multiroots.c b/ext/gsl_native/multiroots.c
index 45675aa..e679739 100644
--- a/ext/gsl_native/multiroots.c
+++ b/ext/gsl_native/multiroots.c
@@ -99,7 +99,7 @@ static void gsl_multiroot_function_mark(gsl_multiroot_function *f)
size_t i;
rb_gc_mark((VALUE) f->params);
// for (i = 0; i < RARRAY(f->params)->len; i++)
- for (i = 0; (int) i < RARRAY_LEN(f->params); i++)
+ for (i = 0; (int) i < RARRAY_LEN((size_t)f->params); i++)
rb_gc_mark(rb_ary_entry((VALUE) f->params, i));
}
@@ -236,7 +236,7 @@ static void gsl_multiroot_function_fdf_mark(gsl_multiroot_function_fdf *f)
size_t i;
rb_gc_mark((VALUE) f->params);
// for (i = 0; i < RARRAY(f->params)->len; i++)
- for (i = 0; (int) i < RARRAY_LEN(f->params); i++)
+ for (i = 0; (int) i < RARRAY_LEN((size_t)f->params); i++)
rb_gc_mark(rb_ary_entry((VALUE) f->params, i));
}
diff --git a/ext/gsl_native/ntuple.c b/ext/gsl_native/ntuple.c
index fb674ff..0779a3a 100644
--- a/ext/gsl_native/ntuple.c
+++ b/ext/gsl_native/ntuple.c
@@ -434,9 +434,9 @@ void Init_gsl_ntuple(VALUE module)
rb_define_singleton_method(cgsl_ntuple, "create", rb_gsl_ntuple_new, -1);
rb_define_singleton_method(cgsl_ntuple, "alloc", rb_gsl_ntuple_new, -1);
rb_define_singleton_method(cgsl_ntuple, "open", rb_gsl_ntuple_open, -1);
- rb_define_singleton_method(cgsl_ntuple, "close", rb_gsl_ntuple_close, 0);
+ rb_define_singleton_method(cgsl_ntuple, "close", rb_gsl_ntuple_close, 1);
- rb_define_method(cgsl_ntuple, "size", rb_gsl_ntuple_size, 0);
+ rb_define_method(cgsl_ntuple, "size", rb_gsl_ntuple_size, 1);
rb_define_method(cgsl_ntuple, "write", rb_gsl_ntuple_write, 0);
rb_define_method(cgsl_ntuple, "bookdata", rb_gsl_ntuple_bookdata, 0);
diff --git a/ext/gsl_native/odeiv.c b/ext/gsl_native/odeiv.c
index ab46ee4..5eecb23 100644
--- a/ext/gsl_native/odeiv.c
+++ b/ext/gsl_native/odeiv.c
@@ -882,7 +882,7 @@ void Init_gsl_odeiv(VALUE module)
rb_define_singleton_method(cgsl_odeiv_control, "standard_alloc", rb_gsl_odeiv_control_standard_new, 4);
rb_define_singleton_method(cgsl_odeiv_control, "y_new", rb_gsl_odeiv_control_y_new, 2);
rb_define_singleton_method(cgsl_odeiv_control, "yp_new", rb_gsl_odeiv_control_yp_new, 2);
- rb_define_singleton_method(cgsl_odeiv_control, "scaled_alloc", rb_gsl_odeiv_control_scaled_new, 5);
+ rb_define_singleton_method(cgsl_odeiv_control, "scaled_alloc", rb_gsl_odeiv_control_scaled_new, 6);
rb_define_method(cgsl_odeiv_control, "init", rb_gsl_odeiv_control_init, 4);
rb_define_method(cgsl_odeiv_control, "name", rb_gsl_odeiv_control_name, 0);
diff --git a/ext/gsl_native/poly_source.h b/ext/gsl_native/poly_source.h
index 914456a..ee02b93 100644
--- a/ext/gsl_native/poly_source.h
+++ b/ext/gsl_native/poly_source.h
@@ -1811,9 +1811,9 @@ void FUNCTION(Init_gsl_poly,init)(VALUE module)
FUNCTION(rb_gsl_poly,deconv2), 2);
rb_define_method(GSL_TYPE(cgsl_poly), "reduce",
- FUNCTION(rb_gsl_poly,reduce), 1);
- rb_define_method(GSL_TYPE(cgsl_poly), "deriv", FUNCTION(rb_gsl_poly,deriv), 1);
- rb_define_method(GSL_TYPE(cgsl_poly), "integ", FUNCTION(rb_gsl_poly,integ), 1);
+ FUNCTION(rb_gsl_poly,reduce), 0);
+ rb_define_method(GSL_TYPE(cgsl_poly), "deriv", FUNCTION(rb_gsl_poly,deriv), 0);
+ rb_define_method(GSL_TYPE(cgsl_poly), "integ", FUNCTION(rb_gsl_poly,integ), 0);
/*****/
diff --git a/ext/gsl_native/rng.c b/ext/gsl_native/rng.c
index 568b3ed..42259f8 100644
--- a/ext/gsl_native/rng.c
+++ b/ext/gsl_native/rng.c
@@ -465,21 +465,21 @@ static VALUE rb_gsl_rng_name(VALUE obj)
return rb_str_new2(gsl_rng_name(r));
}
-static VALUE rb_gsl_rng_max(VALUE obj, VALUE s)
+static VALUE rb_gsl_rng_max(VALUE obj)
{
gsl_rng *r = NULL;
Data_Get_Struct(obj, gsl_rng, r);
return UINT2NUM(gsl_rng_max(r));
}
-static VALUE rb_gsl_rng_min(VALUE obj, VALUE s)
+static VALUE rb_gsl_rng_min(VALUE obj)
{
gsl_rng *r = NULL;
Data_Get_Struct(obj, gsl_rng, r);
return UINT2NUM(gsl_rng_min(r));
}
-static VALUE rb_gsl_rng_size(VALUE obj, VALUE s)
+static VALUE rb_gsl_rng_size(VALUE obj)
{
gsl_rng *r = NULL;
Data_Get_Struct(obj, gsl_rng, r);
diff --git a/ext/gsl_native/sf_bessel.c b/ext/gsl_native/sf_bessel.c
index c0ab45d..87852f0 100644
--- a/ext/gsl_native/sf_bessel.c
+++ b/ext/gsl_native/sf_bessel.c
@@ -847,7 +847,7 @@ void Init_gsl_sf_bessel(VALUE module)
rb_define_module_function(mgsl_sf_bessel, "kl_scaled_array", rb_gsl_sf_bessel_kl_scaled_array, 2);
rb_define_module_function(mgsl_sf_bessel, "Jnu", rb_gsl_sf_bessel_Jnu, 2);
rb_define_module_function(mgsl_sf_bessel, "Jnu_e", rb_gsl_sf_bessel_Jnu_e, 2);
- rb_define_module_function(mgsl_sf_bessel, "sequence_Jnu_e", rb_gsl_sf_bessel_sequence_Jnu_e, 3);
+ rb_define_module_function(mgsl_sf_bessel, "sequence_Jnu_e", rb_gsl_sf_bessel_sequence_Jnu_e, -1);
rb_define_module_function(mgsl_sf_bessel, "Ynu", rb_gsl_sf_bessel_Ynu, 2);
rb_define_module_function(mgsl_sf_bessel, "Ynu_e", rb_gsl_sf_bessel_Ynu_e, 2);
diff --git a/ext/gsl_native/sf_ellint.c b/ext/gsl_native/sf_ellint.c
index 8425f95..583d0b3 100644
--- a/ext/gsl_native/sf_ellint.c
+++ b/ext/gsl_native/sf_ellint.c
@@ -172,7 +172,7 @@ void Init_gsl_sf_ellint(VALUE module)
rb_define_module_function(module, "ellint_P", rb_gsl_sf_ellint_P, -1);
rb_define_module_function(module, "ellint_P_e", rb_gsl_sf_ellint_P_e, 4);
rb_define_module_function(module, "ellint_D", rb_gsl_sf_ellint_D, -1);
- rb_define_module_function(module, "ellint_D_e", rb_gsl_sf_ellint_D_e, 4);
+ rb_define_module_function(module, "ellint_D_e", rb_gsl_sf_ellint_D_e, 3);
rb_define_module_function(module, "ellint_RC", rb_gsl_sf_ellint_RC, -1);
rb_define_module_function(module, "ellint_RC_e", rb_gsl_sf_ellint_RC_e, 3);
rb_define_module_function(module, "ellint_RD", rb_gsl_sf_ellint_RD, -1);
@@ -194,7 +194,7 @@ void Init_gsl_sf_ellint(VALUE module)
rb_define_module_function(mgsl_sf_ellint, "P", rb_gsl_sf_ellint_P, -1);
rb_define_module_function(mgsl_sf_ellint, "P_e", rb_gsl_sf_ellint_P_e, 4);
rb_define_module_function(mgsl_sf_ellint, "D", rb_gsl_sf_ellint_D, -1);
- rb_define_module_function(mgsl_sf_ellint, "D_e", rb_gsl_sf_ellint_D_e, 4);
+ rb_define_module_function(mgsl_sf_ellint, "D_e", rb_gsl_sf_ellint_D_e, 3);
rb_define_module_function(mgsl_sf_ellint, "RC", rb_gsl_sf_ellint_RC, -1);
rb_define_module_function(mgsl_sf_ellint, "RC_e", rb_gsl_sf_ellint_RC_e, 3);
rb_define_module_function(mgsl_sf_ellint, "RD", rb_gsl_sf_ellint_RD, -1);
diff --git a/ext/gsl_native/sf_mathieu.c b/ext/gsl_native/sf_mathieu.c
index b8d33e6..3fd6f2d 100644
--- a/ext/gsl_native/sf_mathieu.c
+++ b/ext/gsl_native/sf_mathieu.c
@@ -147,9 +147,9 @@ static VALUE rb_gsl_sf_mathieu_a(VALUE module, VALUE order, VALUE qq)
return sf_mathieu_eval(order, qq, gsl_sf_mathieu_a);
#endif
}
-static VALUE rb_gsl_sf_mathieu_a_array(VALUE module, int argc, VALUE *argv)
+static VALUE rb_gsl_sf_mathieu_a_array(VALUE module, VALUE argc, VALUE argv)
{
- return sf_mathieu_array_eval(argc, argv, gsl_sf_mathieu_a_array);
+ return sf_mathieu_array_eval((int)argc, &argv, gsl_sf_mathieu_a_array);
}
static VALUE rb_gsl_sf_mathieu_b_e(VALUE module, VALUE order, VALUE qq)
{
@@ -167,9 +167,9 @@ static VALUE rb_gsl_sf_mathieu_b(VALUE module, VALUE order, VALUE qq)
return sf_mathieu_eval(order, qq, gsl_sf_mathieu_b);
#endif
}
-static VALUE rb_gsl_sf_mathieu_b_array(VALUE module, int argc, VALUE *argv)
+static VALUE rb_gsl_sf_mathieu_b_array(VALUE module, VALUE argc, VALUE argv)
{
- return sf_mathieu_array_eval(argc, argv, gsl_sf_mathieu_b_array);
+ return sf_mathieu_array_eval((int)argc, &argv, gsl_sf_mathieu_b_array);
}
static VALUE rb_gsl_sf_mathieu_ce_e(VALUE module, VALUE order, VALUE qq, VALUE zz)
{
@@ -187,9 +187,9 @@ static VALUE rb_gsl_sf_mathieu_ce(VALUE module, VALUE order, VALUE qq, VALUE zz)
return sf_mathieu_eval_int_double2(order, qq, zz, gsl_sf_mathieu_ce);
#endif
}
-static VALUE rb_gsl_sf_mathieu_ce_array(VALUE module, int argc, VALUE *argv)
+static VALUE rb_gsl_sf_mathieu_ce_array(VALUE module, VALUE argc, VALUE argv)
{
- return sf_mathieu_array_eval2(argc, argv, gsl_sf_mathieu_ce_array);
+ return sf_mathieu_array_eval2((int)argc, &argv, gsl_sf_mathieu_ce_array);
}
static VALUE rb_gsl_sf_mathieu_se_e(VALUE module, VALUE order, VALUE qq, VALUE zz)
{
@@ -207,9 +207,9 @@ static VALUE rb_gsl_sf_mathieu_se(VALUE module, VALUE order, VALUE qq, VALUE zz)
return sf_mathieu_eval_int_double2(order, qq, zz, gsl_sf_mathieu_se);
#endif
}
-static VALUE rb_gsl_sf_mathieu_se_array(VALUE module, int argc, VALUE *argv)
+static VALUE rb_gsl_sf_mathieu_se_array(VALUE module, VALUE argc, VALUE argv)
{
- return sf_mathieu_array_eval2(argc, argv, gsl_sf_mathieu_se_array);
+ return sf_mathieu_array_eval2((int)argc, &argv, gsl_sf_mathieu_se_array);
}
/*****/
@@ -229,9 +229,9 @@ static VALUE rb_gsl_sf_mathieu_Mc(VALUE module, VALUE n1, VALUE n2, VALUE q, VAL
return sf_mathieu_eval2(n1, n2, q, x, gsl_sf_mathieu_Mc);
#endif
}
-static VALUE rb_gsl_sf_mathieu_Mc_array(VALUE module, int argc, VALUE *argv)
+static VALUE rb_gsl_sf_mathieu_Mc_array(VALUE module, VALUE argc, VALUE argv)
{
- return sf_mathieu_array_eval3(argc, argv, gsl_sf_mathieu_Mc_array);
+ return sf_mathieu_array_eval3((int)argc, &argv, gsl_sf_mathieu_Mc_array);
}
static VALUE rb_gsl_sf_mathieu_Ms_e(VALUE module, VALUE n1, VALUE n2, VALUE q, VALUE x)
{
@@ -249,9 +249,9 @@ static VALUE rb_gsl_sf_mathieu_Ms(VALUE module, VALUE n1, VALUE n2, VALUE q, VAL
return sf_mathieu_eval2(n1, n2, q, x, gsl_sf_mathieu_Ms);
#endif
}
-static VALUE rb_gsl_sf_mathieu_Ms_array(VALUE module, int argc, VALUE *argv)
+static VALUE rb_gsl_sf_mathieu_Ms_array(VALUE module, VALUE argc, VALUE argv)
{
- return sf_mathieu_array_eval3(argc, argv, gsl_sf_mathieu_Ms_array);
+ return sf_mathieu_array_eval3((int)argc, &argv, gsl_sf_mathieu_Ms_array);
}
/*****/
void Init_sf_mathieu(VALUE module)
@@ -264,20 +264,20 @@ void Init_sf_mathieu(VALUE module)
rb_define_module_function(module, "mathieu_a", rb_gsl_sf_mathieu_a, 2);
rb_define_module_function(module, "mathieu_a_e", rb_gsl_sf_mathieu_a_e, 2);
- rb_define_module_function(module, "mathieu_a_array", rb_gsl_sf_mathieu_a_array, -1);
+ rb_define_module_function(module, "mathieu_a_array", rb_gsl_sf_mathieu_a_array, 2);
rb_define_module_function(module, "mathieu_b", rb_gsl_sf_mathieu_b, 2);
rb_define_module_function(module, "mathieu_b_e", rb_gsl_sf_mathieu_b_e, 2);
- rb_define_module_function(module, "mathieu_b_array", rb_gsl_sf_mathieu_b_array, -1);
+ rb_define_module_function(module, "mathieu_b_array", rb_gsl_sf_mathieu_b_array, 2);
rb_define_module_function(module, "mathieu_ce", rb_gsl_sf_mathieu_ce, 3);
rb_define_module_function(module, "mathieu_ce_e", rb_gsl_sf_mathieu_ce_e, 3);
- rb_define_module_function(module, "mathieu_ce_array", rb_gsl_sf_mathieu_ce_array, -1);
+ rb_define_module_function(module, "mathieu_ce_array", rb_gsl_sf_mathieu_ce_array, 2);
rb_define_module_function(module, "mathieu_se", rb_gsl_sf_mathieu_se, 3);
rb_define_module_function(module, "mathieu_se_e", rb_gsl_sf_mathieu_se_e, 3);
- rb_define_module_function(module, "mathieu_se_array", rb_gsl_sf_mathieu_se_array, -1);
+ rb_define_module_function(module, "mathieu_se_array", rb_gsl_sf_mathieu_se_array, 2);
rb_define_module_function(module, "mathieu_Mc", rb_gsl_sf_mathieu_Mc, 4);
rb_define_module_function(module, "mathieu_Mc_e", rb_gsl_sf_mathieu_Mc_e, 4);
- rb_define_module_function(module, "mathieu_Mc_array", rb_gsl_sf_mathieu_Mc_array, -1);
+ rb_define_module_function(module, "mathieu_Mc_array", rb_gsl_sf_mathieu_Mc_array, 2);
rb_define_module_function(module, "mathieu_Ms", rb_gsl_sf_mathieu_Ms, 4);
rb_define_module_function(module, "mathieu_Ms_e", rb_gsl_sf_mathieu_Ms_e, 4);
- rb_define_module_function(module, "mathieu_Ms_array", rb_gsl_sf_mathieu_Ms_array, -1);
+ rb_define_module_function(module, "mathieu_Ms_array", rb_gsl_sf_mathieu_Ms_array, 2);
}
diff --git a/ext/gsl_native/spline.c b/ext/gsl_native/spline.c
index 3a8b945..91de5b3 100644
--- a/ext/gsl_native/spline.c
+++ b/ext/gsl_native/spline.c
@@ -399,7 +399,7 @@ void Init_gsl_spline(VALUE module)
rb_define_alias(cgsl_spline, "deriv_e", "eval_deriv_e");
rb_define_method(cgsl_spline, "eval_deriv2_e", rb_gsl_spline_eval_deriv2_e, 1);
rb_define_alias(cgsl_spline, "deri2v_e", "eval_deriv2_e");
- rb_define_method(cgsl_spline, "eval_integ_e", rb_gsl_spline_eval_integ_e, 1);
+ rb_define_method(cgsl_spline, "eval_integ_e", rb_gsl_spline_eval_integ_e, 2);
rb_define_alias(cgsl_spline, "integ_e", "eval_integ_e");
rb_define_method(cgsl_spline, "info", rb_gsl_spline_info, 0);
diff --git a/ext/gsl_native/stats.c b/ext/gsl_native/stats.c
index 35d5a58..fc616db 100644
--- a/ext/gsl_native/stats.c
+++ b/ext/gsl_native/stats.c
@@ -706,20 +706,20 @@ void Init_gsl_stats(VALUE module)
/*****/
- rb_define_singleton_method(mgsl_stats, "wmean", rb_gsl_stats_wmean2, -1);
- rb_define_singleton_method(mgsl_stats, "wvariance", rb_gsl_stats_wvariance2, -1);
- rb_define_singleton_method(mgsl_stats, "wvariance_m", rb_gsl_stats_wvariance_m2, -1);
- rb_define_singleton_method(mgsl_stats, "wsd", rb_gsl_stats_wsd2, -1);
- rb_define_singleton_method(mgsl_stats, "wsd_m", rb_gsl_stats_wsd_m2, -1);
+ rb_define_singleton_method(mgsl_stats, "wmean", rb_gsl_stats_wmean2, 2);
+ rb_define_singleton_method(mgsl_stats, "wvariance", rb_gsl_stats_wvariance2, 2);
+ rb_define_singleton_method(mgsl_stats, "wvariance_m", rb_gsl_stats_wvariance_m2, 3);
+ rb_define_singleton_method(mgsl_stats, "wsd", rb_gsl_stats_wsd2, 2);
+ rb_define_singleton_method(mgsl_stats, "wsd_m", rb_gsl_stats_wsd_m2, 3);
rb_define_singleton_method(mgsl_stats, "wvariance_with_fixed_mean",
- rb_gsl_stats_wvariance_with_fixed_mean2, -1);
+ rb_gsl_stats_wvariance_with_fixed_mean2, 3);
rb_define_singleton_method(mgsl_stats, "wsd_with_fixed_mean",
- rb_gsl_stats_wsd_with_fixed_mean2, -1);
- rb_define_singleton_method(mgsl_stats, "wabsdev", rb_gsl_stats_wabsdev2, -1);
- rb_define_singleton_method(mgsl_stats, "wabsdev_m", rb_gsl_stats_wabsdev_m2, -1);
- rb_define_singleton_method(mgsl_stats, "wskew", rb_gsl_stats_wskew2, -1);
+ rb_gsl_stats_wsd_with_fixed_mean2, 3);
+ rb_define_singleton_method(mgsl_stats, "wabsdev", rb_gsl_stats_wabsdev2, 2);
+ rb_define_singleton_method(mgsl_stats, "wabsdev_m", rb_gsl_stats_wabsdev_m2, 3);
+ rb_define_singleton_method(mgsl_stats, "wskew", rb_gsl_stats_wskew2, 2);
rb_define_singleton_method(mgsl_stats, "wskew_m_sd", rb_gsl_stats_wskew_m2, 4);
- rb_define_singleton_method(mgsl_stats, "wkurtosis", rb_gsl_stats_wkurtosis2, -1);
+ rb_define_singleton_method(mgsl_stats, "wkurtosis", rb_gsl_stats_wkurtosis2, 2);
rb_define_singleton_method(mgsl_stats, "wkurtosis_m_sd", rb_gsl_stats_wkurtosis_m2, 4);
/*****/
@@ -747,12 +747,12 @@ void Init_gsl_stats(VALUE module)
rb_define_alias(cgsl_vector, "wabsdev_m", "stats_wabsdev_m");
rb_define_method(cgsl_vector, "stats_wskew", rb_gsl_stats_wskew, -1);
rb_define_alias(cgsl_vector, "wskew", "stats_wskew");
- rb_define_method(cgsl_vector, "stats_wskew_m_sd", rb_gsl_stats_wskew_m_sd, 2);
+ rb_define_method(cgsl_vector, "stats_wskew_m_sd", rb_gsl_stats_wskew_m_sd, 3);
rb_define_alias(cgsl_vector, "wskew_m_sd", "stats_wskew_m_sd");
rb_define_method(cgsl_vector, "stats_wkurtosis", rb_gsl_stats_wkurtosis, -1);
rb_define_alias(cgsl_vector, "wkurtosis", "stats_wkurtosis");
rb_define_method(cgsl_vector, "stats_wkurtosis_m_sd",
- rb_gsl_stats_wkurtosis_m_sd, 2);
+ rb_gsl_stats_wkurtosis_m_sd, 3);
rb_define_alias(cgsl_vector, "wkurtosis_m_sd", "stats_wkurtosis_m_sd");
/*****/
diff --git a/ext/gsl_native/tamu_anova.c b/ext/gsl_native/tamu_anova.c
index 5f9c9f8..eadfdb9 100644
--- a/ext/gsl_native/tamu_anova.c
+++ b/ext/gsl_native/tamu_anova.c
@@ -29,10 +29,10 @@ VALUE rb_tamu_anova_alloc(int argc, VALUE *argv, VALUE klass)
return Data_Wrap_Struct(klass, 0, free, table);
}
-VALUE rb_tamu_anova_printtable(VALUE *vTable)
+VALUE rb_tamu_anova_printtable(VALUE vTable)
{
struct tamu_anova_table *table;
- Data_Get_Struct(*vTable, struct tamu_anova_table, table);
+ Data_Get_Struct(vTable, struct tamu_anova_table, table);
tamu_anova_printtable(*table);
return Qtrue;
}
diff --git a/ext/gsl_native/vector_complex.c b/ext/gsl_native/vector_complex.c
index 83db5ee..8b761b6 100644
--- a/ext/gsl_native/vector_complex.c
+++ b/ext/gsl_native/vector_complex.c
@@ -1829,7 +1829,7 @@ static VALUE rb_gsl_vector_complex_block(VALUE obj)
return Data_Wrap_Struct(cgsl_block_complex, 0, NULL, v->block);
}
-static VALUE rb_gsl_vector_complex_indgen_bang(int argc, VALUE *argv[], VALUE obj)
+static VALUE rb_gsl_vector_complex_indgen_bang(int argc, VALUE argv[], VALUE obj)
{
gsl_vector_complex *v = NULL;
double start = 0.0, step = 1.0, x;
@@ -2112,7 +2112,7 @@ void Init_gsl_vector_complex(VALUE module)
rb_define_method(cgsl_vector_complex, "isnull", rb_gsl_vector_complex_isnull, 0);
rb_define_method(cgsl_vector_complex, "matrix_view", rb_gsl_vector_complex_matrix_view, -1);
- rb_define_method(cgsl_vector_complex, "matrix_view_with_tda", rb_gsl_vector_complex_matrix_view_with_tda, -1);
+ rb_define_method(cgsl_vector_complex, "matrix_view_with_tda", rb_gsl_vector_complex_matrix_view_with_tda, 3);
rb_define_method(cgsl_vector_complex, "trans", rb_gsl_vector_complex_trans, 0);
rb_define_alias(cgsl_vector_complex, "transpose", "trans");
@@ -2238,4 +2238,3 @@ void Init_gsl_vector_complex(VALUE module)
rb_define_method(cgsl_vector_complex, "not_equal?", rb_gsl_vector_complex_not_equal, -1);
rb_define_alias(cgsl_vector_complex, "!=", "not_equal?");
}
-
|