Merge remote-tracking branch 'origin/master'

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": []
     }
   ]
 }

llarp/net/net_int.cpp

@@ -1,5 +1,7 @@
 #include <net/net_int.hpp>
 
+#include <string>
+
 namespace llarp
 {
   template <>

llarp/util/ini.cpp

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

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