Mentions légales du service

Skip to content
Snippets Groups Projects
Commit d6862e1d authored by hhakim's avatar hhakim
Browse files

Fix std::conj calls in MatButterfly functions (the return type can't be always...

Fix std::conj calls in MatButterfly functions (the return type can't be always complex it must be the same type as input here).
parent 9c8752a1
No related branches found
No related tags found
No related merge requests found
#include "faust_conj.h"
namespace Faust
{
template<typename FPP>
......@@ -188,7 +188,7 @@ namespace Faust
#pragma omp parallel for
for(int i=0;i < size; i++)
if(conjugate)
y[i] = std::conj(d1_ptr[i]) * x[i] + std::conj(d2_ptr[i]) * x[subdiag_ids[i]];
y[i] = Faust::conj(d1_ptr[i]) * x[i] + Faust::conj(d2_ptr[i]) * x[subdiag_ids[i]];
else
y[i] = d1_ptr[i] * x[i] + d2_ptr[i] * x[subdiag_ids[i]];
#else
......@@ -231,7 +231,7 @@ namespace Faust
#pragma omp parallel for
for(int i=0;i < Y_nrows; i++)
if(conjugate)
Y_mat.row(i) = std::conj(d1_ptr[i]) * X_mat.row(i) + std::conj(d2_ptr[i]) * X_mat.row(subdiag_ids[i]);
Y_mat.row(i) = Faust::conj(d1_ptr[i]) * X_mat.row(i) + Faust::conj(d2_ptr[i]) * X_mat.row(subdiag_ids[i]);
else
Y_mat.row(i) = d1_ptr[i] * X_mat.row(i) + d2_ptr[i] * X_mat.row(subdiag_ids[i]);
#else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment