Micro-optimize pop_1st_bit() for 32 bits

[stockfish] / src / misc.cpp

diff --git a/src/misc.cpp b/src/misc.cpp
index 7cc6192c1b48b74ceb5014cc1b667892e2d17745..a3b1b0324c8ee20357fb515294696d9b9befb240 100644 (file)
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -17,7 +17,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(_WIN64)
 
 #define _CRT_SECURE_NO_DEPRECATE
 #define NOMINMAX // disable macros min() and max()
@@ -40,13 +40,10 @@
 #endif
 
 #include <algorithm>
-#include <cassert>
-#include <cstdio>
 #include <iomanip>
 #include <iostream>
 #include <sstream>
 
-#include "bitcount.h"
 #include "misc.h"
 #include "thread.h"
 
@@ -56,7 +53,7 @@ using namespace std;
 /// date (in the format YYMMDD) is used as a version number.
 
 static const string Version = "";
-static const string Tag  = "";
+static const string Tag = "";
 
 
 /// engine_info() returns the full name of the current Stockfish version.
@@ -116,7 +113,7 @@ void dbg_print() {
 
 int system_time() {
 
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(_WIN64)
   struct _timeb t;
   _ftime(&t);
   return int(t.time * 1000 + t.millitm);
@@ -132,7 +129,7 @@ int system_time() {
 
 int cpu_count() {
 
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(_WIN64)
   SYSTEM_INFO s;
   GetSystemInfo(&s);
   return std::min(int(s.dwNumberOfProcessors), MAX_THREADS);
@@ -156,9 +153,9 @@ int cpu_count() {
 /// timed_wait() waits for msec milliseconds. It is mainly an helper to wrap
 /// conversion from milliseconds to struct timespec, as used by pthreads.
 
-void timed_wait(WaitCondition* sleepCond, Lock* sleepLock, int msec) {
+void timed_wait(WaitCondition& sleepCond, Lock& sleepLock, int msec) {
 
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(_WIN64)
   int tm = msec;
 #else
   struct timeval t;