Fix compilation on MSVC.

Various small fixes for compiling with MSVC2017.
hanmiltonxing · Oct 25, 2017 · 0d1791e · 0d1791e
1 parent 80c4517
commit 0d1791e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/UCTNode.cpp b/src/UCTNode.cpp
@@ -29,6 +29,7 @@
 #include <functional>
 #include <algorithm>
 #include <random>
+#include <numeric>
 #include "FastState.h"
 #include "UCTNode.h"
 #include "UCTSearch.h"
@@ -186,7 +187,7 @@ void UCTNode::dirichlet_noise(float epsilon, float alpha) {
 
     auto dirichlet_vector = std::vector<float>{};
 
-    std::gamma_distribution<> gamma(alpha, 1.0f);
+    std::gamma_distribution<float> gamma(alpha, 1.0f);
     for (size_t i = 0; i < child_cnt; i++) {
         dirichlet_vector.emplace_back(gamma(*Random::get_Rng()));
     }
@@ -298,7 +299,7 @@ int UCTNode::get_visits() const {
 
 float UCTNode::get_eval() const {
     assert(!first_visit());
-    return m_blackevals / (double)get_visits();
+    return static_cast<float>(m_blackevals / (double)get_visits());
 }
 
 float UCTNode::get_eval(int tomove) const {

diff --git a/src/Utils.cpp b/src/Utils.cpp
@@ -25,7 +25,7 @@
 #include <stdarg.h>
 #include <thread>
 #include <mutex>
-#ifdef WIN32
+#ifdef _WIN32
 #include <windows.h>
 #else
 #include <sys/select.h>
@@ -71,7 +71,7 @@ bool Utils::input_pending(void) {
         }
 
         if (dw) {
-            return input_causes_stop();
+            return true;
         } else {
             return false;
         }
@@ -84,7 +84,7 @@ bool Utils::input_pending(void) {
         if (dw <= 1) {
             return false;
         } else {
-            return input_causes_stop();
+            return true;
         }
     }
 #endif