Mercurial > octave-nkf
diff liboctave/fMatrix.cc @ 11516:53edbf95fbb6
avoid GCC warnings
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 13 Jan 2011 15:40:14 -0500 |
| parents | 7c573eb981eb |
| children | 141b3fb5cef7 |
line wrap: on
line diff
--- a/liboctave/fMatrix.cc Thu Jan 13 10:00:13 2011 -0500 +++ b/liboctave/fMatrix.cc Thu Jan 13 15:40:14 2011 -0500 @@ -3095,11 +3095,10 @@ %!assert(2*rv*cv,[rv,rv]*[cv;cv],5e-6) */ -static const char * +static char get_blas_trans_arg (bool trans) { - static char blas_notrans = 'N', blas_trans = 'T'; - return (trans) ? &blas_trans : &blas_notrans; + return trans ? 'T' : 'N'; } // the general GEMM operation @@ -3131,9 +3130,9 @@ retval = FloatMatrix (a_nr, b_nc); float *c = retval.fortran_vec (); - const char *ctra = get_blas_trans_arg (tra); + const char ctra = get_blas_trans_arg (tra); F77_XFCN (ssyrk, SSYRK, (F77_CONST_CHAR_ARG2 ("U", 1), - F77_CONST_CHAR_ARG2 (ctra, 1), + F77_CONST_CHAR_ARG2 (&ctra, 1), a_nr, a_nc, 1.0, a.data (), lda, 0.0, c, a_nr F77_CHAR_ARG_LEN (1) @@ -3157,8 +3156,8 @@ F77_FUNC (xsdot, XSDOT) (a_nc, a.data (), 1, b.data (), 1, *c); else { - const char *ctra = get_blas_trans_arg (tra); - F77_XFCN (sgemv, SGEMV, (F77_CONST_CHAR_ARG2 (ctra, 1), + const char ctra = get_blas_trans_arg (tra); + F77_XFCN (sgemv, SGEMV, (F77_CONST_CHAR_ARG2 (&ctra, 1), lda, tda, 1.0, a.data (), lda, b.data (), 1, 0.0, c, 1 F77_CHAR_ARG_LEN (1))); @@ -3166,18 +3165,18 @@ } else if (a_nr == 1) { - const char *crevtrb = get_blas_trans_arg (! trb); - F77_XFCN (sgemv, SGEMV, (F77_CONST_CHAR_ARG2 (crevtrb, 1), + const char crevtrb = get_blas_trans_arg (! trb); + F77_XFCN (sgemv, SGEMV, (F77_CONST_CHAR_ARG2 (&crevtrb, 1), ldb, tdb, 1.0, b.data (), ldb, a.data (), 1, 0.0, c, 1 F77_CHAR_ARG_LEN (1))); } else { - const char *ctra = get_blas_trans_arg (tra); - const char *ctrb = get_blas_trans_arg (trb); - F77_XFCN (sgemm, SGEMM, (F77_CONST_CHAR_ARG2 (ctra, 1), - F77_CONST_CHAR_ARG2 (ctrb, 1), + const char ctra = get_blas_trans_arg (tra); + const char ctrb = get_blas_trans_arg (trb); + F77_XFCN (sgemm, SGEMM, (F77_CONST_CHAR_ARG2 (&ctra, 1), + F77_CONST_CHAR_ARG2 (&ctrb, 1), a_nr, b_nc, a_nc, 1.0, a.data (), lda, b.data (), ldb, 0.0, c, a_nr F77_CHAR_ARG_LEN (1)