[hamradio-commits] [gnss-sdr] 89/236: More elegant workaround for 32-bit architecutres

[Carles Fernandez]

This is an automated email from the git hooks/post-receive script.

carles_fernandez-guest pushed a commit to branch next
in repository gnss-sdr.

commit 268f298fad34bb4deb16ed9d9625de9ca89fa5ea
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Sat Mar 12 09:28:25 2016 +0100

    More elegant workaround for 32-bit architecutres
---
 .../volk_gnsssdr/volk_gnsssdr_16ic_x2_dotprodxnpuppet_16ic.h | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_dotprodxnpuppet_16ic.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_dotprodxnpuppet_16ic.h
index a7905d7..1198044 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_dotprodxnpuppet_16ic.h
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_dotprodxnpuppet_16ic.h
@@ -61,7 +61,7 @@ static inline void volk_gnsssdr_16ic_x2_dotprodxnpuppet_16ic_generic(lv_16sc_t*
     volk_gnsssdr_free(in_a);
 }
 
-#endif  // Generic
+#endif  /* Generic */
 
 #ifdef LV_HAVE_SSE2
 static inline void volk_gnsssdr_16ic_x2_dotprodxnpuppet_16ic_a_sse2(lv_16sc_t* result, const lv_16sc_t* local_code, const lv_16sc_t* in, unsigned int num_points)
@@ -83,12 +83,10 @@ static inline void volk_gnsssdr_16ic_x2_dotprodxnpuppet_16ic_a_sse2(lv_16sc_t* r
     volk_gnsssdr_free(in_a);
 }
 
-#endif // SSE2
+#endif /*  SSE2   */
 
-#define WORKAROUND 1
-#ifdef WORKAROUND
 
-#ifdef LV_HAVE_SSE2
+#if LV_HAVE_SSE2 && LV_HAVE_64
 
 static inline void volk_gnsssdr_16ic_x2_dotprodxnpuppet_16ic_u_sse2(lv_16sc_t* result, const lv_16sc_t* local_code, const lv_16sc_t* in, unsigned int num_points)
 {
@@ -108,8 +106,8 @@ static inline void volk_gnsssdr_16ic_x2_dotprodxnpuppet_16ic_u_sse2(lv_16sc_t* r
     }
     volk_gnsssdr_free(in_a);
 }
-#endif
-#endif // SSE2
+
+#endif /* LV_HAVE_SSE2 && LV_HAVE_64 */
 
 #ifdef LV_HAVE_NEON
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git