Skip to content

Commit dc856de

Browse files
authored
Merge pull request #3765 from martin-frbg/f2cpointer
Fix pointer/integer argument mismatch in the f2c-translated LAPACK
2 parents 8273ab6 + 91110f9 commit dc856de

23 files changed

Lines changed: 51 additions & 51 deletions

ctest/c_sblat1c.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -969,7 +969,7 @@ real *sfac;
969969
1.17 };
970970

971971
/* Local variables */
972-
extern /* Subroutine */ srottest_();
972+
extern /* Subroutine */ void srottest_();
973973
static integer i__, k, ksize;
974974
extern /* Subroutine */ int stest_(), srotmtest_();
975975
static integer ki, kn;

lapack-netlib/SRC/claed0.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -796,10 +796,10 @@ f"> */
796796

797797
temp = log((real) (*n)) / log(2.f);
798798
lgn = (integer) temp;
799-
if (pow_ii(&c__2, &lgn) < *n) {
799+
if (pow_ii(c__2, lgn) < *n) {
800800
++lgn;
801801
}
802-
if (pow_ii(&c__2, &lgn) < *n) {
802+
if (pow_ii(c__2, lgn) < *n) {
803803
++lgn;
804804
}
805805
iprmpt = indxq + *n + 1;

lapack-netlib/SRC/claed7.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -864,11 +864,11 @@ f"> */
864864
/* Form the z-vector which consists of the last row of Q_1 and the */
865865
/* first row of Q_2. */
866866

867-
ptr = pow_ii(&c__2, tlvls) + 1;
867+
ptr = pow_ii(c__2, *tlvls) + 1;
868868
i__1 = *curlvl - 1;
869869
for (i__ = 1; i__ <= i__1; ++i__) {
870870
i__2 = *tlvls - i__;
871-
ptr += pow_ii(&c__2, &i__2);
871+
ptr += pow_ii(c__2, i__2);
872872
/* L10: */
873873
}
874874
curr = ptr + *curpbm;

lapack-netlib/SRC/clalsa.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1051,7 +1051,7 @@ f"> */
10511051
/* Finally go through the left singular vector matrices of all */
10521052
/* the other subproblems bottom-up on the tree. */
10531053

1054-
j = pow_ii(&c__2, &nlvl);
1054+
j = pow_ii(c__2, nlvl);
10551055
sqre = 0;
10561056

10571057
for (lvl = nlvl; lvl >= 1; --lvl) {
@@ -1065,7 +1065,7 @@ f"> */
10651065
ll = 1;
10661066
} else {
10671067
i__1 = lvl - 1;
1068-
lf = pow_ii(&c__2, &i__1);
1068+
lf = pow_ii(c__2, i__1);
10691069
ll = (lf << 1) - 1;
10701070
}
10711071
i__1 = ll;
@@ -1110,7 +1110,7 @@ f"> */
11101110
ll = 1;
11111111
} else {
11121112
i__2 = lvl - 1;
1113-
lf = pow_ii(&c__2, &i__2);
1113+
lf = pow_ii(c__2, i__2);
11141114
ll = (lf << 1) - 1;
11151115
}
11161116
i__2 = lf;

lapack-netlib/SRC/cstedc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -836,10 +836,10 @@ f"> */
836836
lrwmin = *n - 1 << 1;
837837
} else if (icompz == 1) {
838838
lgn = (integer) (log((real) (*n)) / log(2.f));
839-
if (pow_ii(&c__2, &lgn) < *n) {
839+
if (pow_ii(c__2, lgn) < *n) {
840840
++lgn;
841841
}
842-
if (pow_ii(&c__2, &lgn) < *n) {
842+
if (pow_ii(c__2, lgn) < *n) {
843843
++lgn;
844844
}
845845
lwmin = *n * *n;

lapack-netlib/SRC/dlaed0.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -827,10 +827,10 @@ f"> */
827827

828828
temp = log((doublereal) (*n)) / log(2.);
829829
lgn = (integer) temp;
830-
if (pow_ii(&c__2, &lgn) < *n) {
830+
if (pow_ii(c__2, lgn) < *n) {
831831
++lgn;
832832
}
833-
if (pow_ii(&c__2, &lgn) < *n) {
833+
if (pow_ii(c__2, lgn) < *n) {
834834
++lgn;
835835
}
836836
iprmpt = indxq + *n + 1;

lapack-netlib/SRC/dlaed7.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -885,11 +885,11 @@ f"> */
885885
/* Form the z-vector which consists of the last row of Q_1 and the */
886886
/* first row of Q_2. */
887887

888-
ptr = pow_ii(&c__2, tlvls) + 1;
888+
ptr = pow_ii(c__2, *tlvls) + 1;
889889
i__1 = *curlvl - 1;
890890
for (i__ = 1; i__ <= i__1; ++i__) {
891891
i__2 = *tlvls - i__;
892-
ptr += pow_ii(&c__2, &i__2);
892+
ptr += pow_ii(c__2, i__2);
893893
/* L10: */
894894
}
895895
curr = ptr + *curpbm;

lapack-netlib/SRC/dlaeda.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,7 @@ f"> */
754754
/* scheme */
755755

756756
i__1 = *curlvl - 1;
757-
curr = ptr + *curpbm * pow_ii(&c__2, curlvl) + pow_ii(&c__2, &i__1) - 1;
757+
curr = ptr + *curpbm * pow_ii(c__2, *curlvl) + pow_ii(c__2, i__1) - 1;
758758

759759
/* Determine size of these matrices. We add HALF to the value of */
760760
/* the SQRT in case the machine underestimates one of these square */
@@ -781,12 +781,12 @@ f"> */
781781
/* rotations and permutation and then multiplying the center matrices */
782782
/* against the current Z. */
783783

784-
ptr = pow_ii(&c__2, tlvls) + 1;
784+
ptr = pow_ii(c__2, *tlvls) + 1;
785785
i__1 = *curlvl - 1;
786786
for (k = 1; k <= i__1; ++k) {
787787
i__2 = *curlvl - k;
788788
i__3 = *curlvl - k - 1;
789-
curr = ptr + *curpbm * pow_ii(&c__2, &i__2) + pow_ii(&c__2, &i__3) -
789+
curr = ptr + *curpbm * pow_ii(c__2, i__2) + pow_ii(c__2, i__3) -
790790
1;
791791
psiz1 = prmptr[curr + 1] - prmptr[curr];
792792
psiz2 = prmptr[curr + 2] - prmptr[curr + 1];
@@ -847,7 +847,7 @@ f"> */
847847
c__1);
848848

849849
i__2 = *tlvls - k;
850-
ptr += pow_ii(&c__2, &i__2);
850+
ptr += pow_ii(c__2, i__2);
851851
/* L70: */
852852
}
853853

lapack-netlib/SRC/dlalsa.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -951,7 +951,7 @@ f"> */
951951
/* Finally go through the left singular vector matrices of all */
952952
/* the other subproblems bottom-up on the tree. */
953953

954-
j = pow_ii(&c__2, &nlvl);
954+
j = pow_ii(c__2, nlvl);
955955
sqre = 0;
956956

957957
for (lvl = nlvl; lvl >= 1; --lvl) {
@@ -965,7 +965,7 @@ f"> */
965965
ll = 1;
966966
} else {
967967
i__1 = lvl - 1;
968-
lf = pow_ii(&c__2, &i__1);
968+
lf = pow_ii(c__2, i__1);
969969
ll = (lf << 1) - 1;
970970
}
971971
i__1 = ll;
@@ -1010,7 +1010,7 @@ f"> */
10101010
ll = 1;
10111011
} else {
10121012
i__2 = lvl - 1;
1013-
lf = pow_ii(&c__2, &i__2);
1013+
lf = pow_ii(c__2, i__2);
10141014
ll = (lf << 1) - 1;
10151015
}
10161016
i__2 = lf;

lapack-netlib/SRC/dlasd0.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -824,7 +824,7 @@ f"> */
824824
ll = 1;
825825
} else {
826826
i__1 = lvl - 1;
827-
lf = pow_ii(&c__2, &i__1);
827+
lf = pow_ii(c__2, i__1);
828828
ll = (lf << 1) - 1;
829829
}
830830
i__1 = ll;

0 commit comments

Comments
 (0)