Fixup MSVC build

oxen-io · May 15, 2019 · f734ffe · f734ffe
1 parent 4bf2020
commit f734ffe
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/CMakeSettings.json b/CMakeSettings.json
@@ -11,6 +11,18 @@
       "buildCommandArgs": "-v",
       "ctestCommandArgs": "",
       "variables": []
+    },
+    {
+      "name": "x64-Release",
+      "generator": "Ninja",
+      "configurationType": "RelWithDebInfo",
+      "buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}",
+      "installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "-v",
+      "ctestCommandArgs": "",
+      "inheritEnvironments": [ "msvc_x64_x64" ],
+      "variables": []
     }
   ]
 }
diff --git a/llarp/net/net_int.cpp b/llarp/net/net_int.cpp
@@ -1,5 +1,7 @@
 #include <net/net_int.hpp>
 
+#include <string>
+
 namespace llarp
 {
   template <>

diff --git a/llarp/util/ini.cpp b/llarp/util/ini.cpp
@@ -4,6 +4,10 @@
 #include <iostream>
 #include <util/logger.hpp>
 
+#ifdef LoadString
+#undef LoadString
+#endif
+
 namespace llarp
 {
   bool

diff --git a/llarp/util/threadpool.cpp b/llarp/util/threadpool.cpp
@@ -61,7 +61,7 @@ llarp_threadpool_queue_job(struct llarp_threadpool *pool,
   {
     while(!pool->impl->tryAddJob(std::bind(job.work, job.user)))
     {
-      ::usleep(1000);
+      std::this_thread::sleep_for(std::chrono::microseconds(1000));
     }
   }
   else
-Original file line number
+Diff line change
@@ Expand Up / @@ -61,7 +61,7 @@ llarp_threadpool_queue_job(struct llarp_threadpool *pool, @@
       {
         while(!pool->impl->tryAddJob(std::bind(job.work, job.user)))
         {
-          ::usleep(1000);
+          std::this_thread::sleep_for(std::chrono::microseconds(1000));
         }
       }
       else
@@ Expand Down @@