From a2373d8919f5dea4c571824cf3e59ce9d3b9d1d6 Mon Sep 17 00:00:00 2001 From: Guilhem Lavaux Date: Mon, 3 Mar 2014 19:06:31 +0100 Subject: [PATCH] Fixed types --- src/fourier/details/euclidian_maps.hpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/fourier/details/euclidian_maps.hpp b/src/fourier/details/euclidian_maps.hpp index 5673565..4cbf6a3 100644 --- a/src/fourier/details/euclidian_maps.hpp +++ b/src/fourier/details/euclidian_maps.hpp @@ -36,6 +36,7 @@ knowledge of the CeCILL license and that you accept its terms. #ifndef __DETAILS_EUCLIDIAN_MAPS #define __DETAILS_EUCLIDIAN_MAPS +#include namespace CosmoTool { @@ -246,7 +247,7 @@ namespace CosmoTool { long idx = q0+dims[0]*p; assert(idx < this->size()); - result += 2*(conj(d1[idx]) * d2[idx]).real(); + result += T(2)*(std::conj(d1[idx]) * d2[idx]).real(); } } if (even0) @@ -254,8 +255,8 @@ namespace CosmoTool for (long p = 0; p < plane_size; p++) { long q0 = N0*p, q1 = (p+1)*N0-1; - result += 2*conj(d1[q0]) * d2[q0]; - result += 2*conj(d1[q1]) * d2[q1]; + result += T(2)*std::conj(d1[q0]) * d2[q0]; + result += T(2)*std::conj(d1[q1]) * d2[q1]; } } return result;