Fix compile errors under MSVC

Fallback from previous patches.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>

diff --git a/src/bitcount.h b/src/bitcount.h
index 4016063383938fe7fbcc9309ff9767a2bfec6a7c..a4133fb21723db8981205fdf6f0f843f580e0190 100644 (file)
--- a/src/bitcount.h
+++ b/src/bitcount.h
@@ -48,7 +48,7 @@
 
 // Select type of intrinsic bit count instruction to use
 
-#if defined(_MSC_VER) // Microsoft compiler
+#if defined(_MSC_VER) && defined(_WIN64) // Microsoft compiler
 
 #include <intrin.h>
 

diff --git a/src/main.cpp b/src/main.cpp
index 210b8363345ac58b77ae0d9dc81b3ff00d066617..9c8601148decb1fa1874418f0cd9f6cd631f48d8 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,7 +18,7 @@
 */
 
 // To profile with callgrind uncomment following line
-#define USE_CALLGRIND
+//#define USE_CALLGRIND
 
 
 ////

diff --git a/src/movegen.cpp b/src/movegen.cpp
index a783a6251b8b7ca6319d127cb7b1eb8842fa8dbb..4f1d14dee0ed4814db3aac1a5f124aac115dee28 100644 (file)
--- a/src/movegen.cpp
+++ b/src/movegen.cpp
@@ -24,6 +24,7 @@
 
 #include <cassert>
 
+#include "bitcount.h"
 #include "movegen.h"
 
 // Simple macro to wrap a very common while loop, no facny, no flexibility,
@@ -333,7 +334,7 @@ int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) {
           // The checking pawn cannot be a discovered (bishop) check candidate
           // otherwise we were in check also before last double push move.
           assert(!bit_is_set(pos.discovered_check_candidates(them), checksq));
-          assert(count_1s(b1) == 1 || count_1s(b1) == 2);
+          assert(count_1s<false>(b1) == 1 || count_1s<false>(b1) == 2);
 
           b1 &= ~pinned;
           while (b1)