From 374afd8759420e7774caa832a934cd0da3ae8051 Mon Sep 17 00:00:00 2001
From: Moritz Fischer
Date: Mon, 7 May 2012 21:25:28 -0400
Subject: volk: fixed popcnt.

---
 volk/include/volk/volk_64u_popcnt_a.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/volk/include/volk/volk_64u_popcnt_a.h b/volk/include/volk/volk_64u_popcnt_a.h
index 7d7359ccf..5e68ed208 100644
--- a/volk/include/volk/volk_64u_popcnt_a.h
+++ b/volk/include/volk/volk_64u_popcnt_a.h
@@ -14,7 +14,7 @@ static inline void volk_64u_popcnt_a_generic(uint64_t* ret, const uint64_t value
 
   // This is faster than a lookup table
   //uint32_t retVal = valueVector[0];
-  uint32_t retVal = (uint32_t)(value && 0x00000000FFFFFFFF);
+  uint32_t retVal = (uint32_t)(value & 0x00000000FFFFFFFF);
 
   retVal = (retVal & 0x55555555) + (retVal >> 1 & 0x55555555);
   retVal = (retVal & 0x33333333) + (retVal >> 2 & 0x33333333);
@@ -24,7 +24,7 @@ static inline void volk_64u_popcnt_a_generic(uint64_t* ret, const uint64_t value
   uint64_t retVal64  = retVal;
 
   //retVal = valueVector[1];
-  retVal = (uint32_t)((value && 0xFFFFFFFF00000000) >> 31);
+  retVal = (uint32_t)((value & 0xFFFFFFFF00000000) >> 31);
   retVal = (retVal & 0x55555555) + (retVal >> 1 & 0x55555555);
   retVal = (retVal & 0x33333333) + (retVal >> 2 & 0x33333333);
   retVal = (retVal + (retVal >> 4)) & 0x0F0F0F0F;
-- 
cgit