Merge pull request #3 from merly-ai/win64_support

fixing minor issue with min/max, and warnings
benman64 · Feb 24, 2022 · 1458d88 · 1458d88
2 parents 535b537 + 887327a
commit 1458d88
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/cpp/subprocess/ProcessBuilder.cpp b/src/cpp/subprocess/ProcessBuilder.cpp
@@ -333,7 +333,7 @@ namespace subprocess {
     int Popen::wait(double timeout) {
         if (returncode != kBadReturnCode)
             return returncode;
-        DWORD ms = timeout < 0? INFINITE : timeout*1000.0;
+        DWORD ms = timeout < 0 ? INFINITE : (DWORD)(timeout*1000.0);
         DWORD result = WaitForSingleObject(process_info.hProcess, ms);
         if (result == WAIT_TIMEOUT) {
             throw TimeoutExpired("timeout of " + std::to_string(ms) + " expired");

diff --git a/src/cpp/subprocess/basic_types.hpp b/src/cpp/subprocess/basic_types.hpp
@@ -1,5 +1,6 @@
 #pragma once
 #ifdef _WIN32
+#define NOMINMAX
 #include <windows.h>
 #else
 #include <unistd.h>

diff --git a/src/cpp/subprocess/shell_utils.cpp b/src/cpp/subprocess/shell_utils.cpp
@@ -42,7 +42,7 @@ namespace {
             if (path.empty())
                 return false;
             return std::filesystem::is_regular_file(path);
-        } catch (std::filesystem::filesystem_error& e) {
+        } catch (std::filesystem::filesystem_error&) {
             return false;
         }
     }