From 5f59dd1644bfe64a02c24b4fc67dfd8f7c09bba6 Mon Sep 17 00:00:00 2001
From: Nuno Lopes <a-nlopes@microsoft.com>
Date: Sun, 28 Sep 2014 11:37:11 +0100
Subject: [PATCH] revert usage of popcnt is MSVC

Signed-off-by: Nuno Lopes <a-nlopes@microsoft.com>
---
 src/util/util.h | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/util/util.h b/src/util/util.h
index eb24ece13..cbc19b759 100644
--- a/src/util/util.h
+++ b/src/util/util.h
@@ -24,9 +24,6 @@ Revision History:
 #include<iostream>
 #include<climits>
 #include<limits>
-#ifdef _MSC_VER
-#include<intrin.h>
-#endif
 
 #ifndef SIZE_MAX
 #define SIZE_MAX std::numeric_limits<std::size_t>::max()
@@ -99,9 +96,7 @@ COMPILE_TIME_ASSERT(sizeof(unsigned) == 4);
 
 // Return the number of 1 bits in v.
 static inline unsigned get_num_1bits(unsigned v) {
-#ifdef _MSC_VER
-    return __popcnt(v);
-#elif defined(__GNUC__)
+#ifdef __GNUC__
     return __builtin_popcount(v);
 #else
 #ifdef Z3DEBUG