commit 8194963098247be6bca9cc4a54dbfa65c73e8ccc
author Vladimir Marko <vmarko@google.com> Fri May 02 11:53:22 2014 +0100
committer Vladimir Marko <vmarko@google.com> Fri May 02 12:21:02 2014 +0100
tree 547cc708e06e6541676b17066023ae6f07b2049b
parent 56a341a82ece9aa4f2a071629f3e1fd1adf988ae

Replace CountOneBits and __builtin_popcount with POPCOUNT.

Clean up utils.h, make some functions constexpr.

Change-Id: I2399100280cbce81c3c4f5765f0680c1ddcb5883

runtime/vmap_table.h

diff --git a/runtime/vmap_table.h b/runtime/vmap_table.h
index 2fbaebe..9821753 100644
--- a/runtime/vmap_table.h
+++ b/runtime/vmap_table.h
@@ -99,7 +99,7 @@
       }
       matches++;
     }
-    CHECK_LT(vmap_offset - matches, static_cast<uint32_t>(__builtin_popcount(spill_mask)));
+    CHECK_LT(vmap_offset - matches, static_cast<uint32_t>(POPCOUNT(spill_mask)));
     uint32_t spill_shifts = 0;
     while (matches != (vmap_offset + 1)) {
       DCHECK_NE(spill_mask, 0u);