Main: VC++ 14.1 adjustments. bugref:8489

git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@83794 cfe28804-0f27-0410-a406-dd0f0b0b656f

3 files changed, 7 insertions, 7 deletions

diff --git a/src/VBox/Main/src-server/win/HostDnsServiceWin.cpp b/src/VBox/Main/src-server/win/HostDnsServiceWin.cpp
index 9fae3ca53cd..aa028ee6430 100644
--- a/src/VBox/Main/src-server/win/HostDnsServiceWin.cpp
+++ b/src/VBox/Main/src-server/win/HostDnsServiceWin.cpp
@@ -37,8 +37,8 @@
 #include <iprt/win/iphlpapi.h>
 
 #include <algorithm>
-#include <sstream>
-#include <string>
+#include <iprt/sanitized/sstream>
+#include <iprt/sanitized/string>
 #include <vector>
 
 static inline int registerNotification(const HKEY& hKey, HANDLE& hEvent);
diff --git a/src/VBox/Main/src-server/win/NetIf-win.cpp b/src/VBox/Main/src-server/win/NetIf-win.cpp
index 21249566445..5b29b4e9590 100644
--- a/src/VBox/Main/src-server/win/NetIf-win.cpp
+++ b/src/VBox/Main/src-server/win/NetIf-win.cpp
@@ -1909,7 +1909,7 @@ int NetIfList(std::list<ComObjPtr<HostNetworkInterface> > &list)
     else
     {
         std::list<BoundAdapter> boundAdapters;
-        HRESULT hr = netIfGetBoundAdapters(boundAdapters);
+        hr = netIfGetBoundAdapters(boundAdapters);
 #if 0
         if (hr != S_OK)
             hr = netIfGetBoundAdaptersFallback(boundAdapters);
diff --git a/src/VBox/Main/src-server/win/svcmain.cpp b/src/VBox/Main/src-server/win/svcmain.cpp
index b2aafe4383e..07248b72df5 100644
--- a/src/VBox/Main/src-server/win/svcmain.cpp
+++ b/src/VBox/Main/src-server/win/svcmain.cpp
@@ -184,8 +184,8 @@ bool CExeModule::StartMonitor()
     hEventShutdown = CreateEvent(NULL, false, false, NULL);
     if (hEventShutdown == NULL)
         return false;
-    DWORD dwThreadID;
-    HANDLE h = CreateThread(NULL, 0, MonitorProc, this, 0, &dwThreadID);
+    DWORD idThreadIgnored;
+    HANDLE h = CreateThread(NULL, 0, MonitorProc, this, 0, &idThreadIgnored);
     return (h != NULL);
 }
 
@@ -239,8 +239,8 @@ public:
     HRESULT i_getVirtualBox(IUnknown **ppResult);
 
 private:
-    HRESULT VirtualBoxClassFactory::i_registerWithSds(IUnknown **ppOtherVirtualBox);
-    void    VirtualBoxClassFactory::i_deregisterWithSds(void);
+    HRESULT i_registerWithSds(IUnknown **ppOtherVirtualBox);
+    void    i_deregisterWithSds(void);
 
     friend VBoxSVCRegistration;
 };