Mercurial > octave
diff src/data.cc @ 13731:3b52038e6e6c
Help dumb compilers to resolve template parameters.
* boolNDArray.cc (boolNDArray::operator!): Specify second template parameter
for do_mx_unary_map_op.
* Sparse-op-defs.h (SPARSE_MSM_BIN_OP_2): Specify template parameter for
mx_inline_all_infinite.
(SPARSE_SMM_BIN_OP_2_CHECK_product): Add argument to macro and use it as
template parameter for mx_inline_all_infinite.
(SPARSE_SMM_BIN_OP_2_CHECK_quotient): Likewise for mx_inline_all_nan.
(SPARSE_SMM_BIN_OP_2): Use new argument for product and quotient macros.
* data.cc (Frem): Specify template parameter for xrem.
(Fmod): Specify template parameter for xmod.
| author | Michael Goffioul <michael.goffioul@gmail.com> |
|---|---|
| date | Thu, 20 Oct 2011 12:54:40 +0100 |
| parents | 7dce7e110511 |
| children | 1d97688f8522 |
line wrap: on
line diff
--- a/src/data.cc Thu Oct 20 12:54:32 2011 +0100 +++ b/src/data.cc Thu Oct 20 12:54:40 2011 +0100 @@ -589,7 +589,7 @@ { FloatNDArray a0 = args(0).float_array_value (); FloatNDArray a1 = args(1).float_array_value (); - retval = binmap<float> (a0, a1, xrem, "rem"); + retval = binmap<float> (a0, a1, xrem<float>, "rem"); } } else @@ -603,13 +603,13 @@ { SparseMatrix m0 = args(0).sparse_matrix_value (); SparseMatrix m1 = args(1).sparse_matrix_value (); - retval = binmap<double> (m0, m1, xrem, "rem"); + retval = binmap<double> (m0, m1, xrem<double>, "rem"); } else { NDArray a0 = args(0).array_value (); NDArray a1 = args(1).array_value (); - retval = binmap<double> (a0, a1, xrem, "rem"); + retval = binmap<double> (a0, a1, xrem<double>, "rem"); } } } @@ -722,7 +722,7 @@ { FloatNDArray a0 = args(0).float_array_value (); FloatNDArray a1 = args(1).float_array_value (); - retval = binmap<float> (a0, a1, xmod, "mod"); + retval = binmap<float> (a0, a1, xmod<float>, "mod"); } } else @@ -736,13 +736,13 @@ { SparseMatrix m0 = args(0).sparse_matrix_value (); SparseMatrix m1 = args(1).sparse_matrix_value (); - retval = binmap<double> (m0, m1, xmod, "mod"); + retval = binmap<double> (m0, m1, xmod<double>, "mod"); } else { NDArray a0 = args(0).array_value (); NDArray a1 = args(1).array_value (); - retval = binmap<double> (a0, a1, xmod, "mod"); + retval = binmap<double> (a0, a1, xmod<double>, "mod"); } } }