Minor update

Author: kimwalisch

include/popcnt.hpp

@@ -18,8 +18,7 @@
   #define __has_builtin(x) 0
 #endif
 
-#if defined(__GNUC__) || \
-    __has_builtin(__builtin_popcountll)
+#if defined(__GNUC__) || __has_builtin(__builtin_popcountll)
 
 inline uint64_t popcnt64(uint64_t x)
 {
@@ -51,10 +50,10 @@ inline uint64_t popcnt64(uint64_t x)
 
 inline uint64_t popcnt64(uint64_t x)
 {
-  uint64_t m1 = 0x5555555555555555ll;
-  uint64_t m2 = 0x3333333333333333ll;
-  uint64_t m4 = 0x0F0F0F0F0F0F0F0Fll;
-  uint64_t h01 = 0x0101010101010101ll;
+  uint64_t m1 = 0x5555555555555555ull;
+  uint64_t m2 = 0x3333333333333333ull;
+  uint64_t m4 = 0x0F0F0F0F0F0F0F0Full;
+  uint64_t h01 = 0x0101010101010101ull;
 
   x -= (x >> 1) & m1;
   x = (x & m2) + ((x >> 2) & m2);