Merge pull request #732 from GeorgH93/master

Fix build on Windows

clean_build.bat

@@ -67,9 +67,11 @@ if exist bin\Debug (
 )
 
 echo Build completed successfully
+set BUILD_FAILED=0
 goto done
 
 :failed
+set BUILD_FAILED=%ERRORLEVEL%
 echo Build failed
 
 :done
@@ -84,3 +86,5 @@ set BONJOUR_SDK_HOME=
 set B_QT_FULLPATH=
 set savedir=
 set cmake_gen=
+
+EXIT /B %BUILD_FAILED%

src/lib/arch/win32/ArchInternetWindows.cpp

@@ -18,6 +18,7 @@
 #include "arch/win32/ArchInternetWindows.h"
 #include "arch/win32/XArchWindows.h"
 #include "arch/Arch.h"
+#include "base/String.h"
 #include "common/Version.h"
 
 #include <sstream>

src/lib/arch/win32/XArchWindows.cpp

@@ -18,6 +18,7 @@
 
 #include "arch/win32/XArchWindows.h"
 #include "arch/win32/ArchNetworkWinsock.h"
+#include "base/String.h"
 
 //
 // XArchEvalWindows

src/lib/arch/win32/XArchWindows.h

@@ -30,7 +30,7 @@ public:
     XArchEvalWindows(DWORD error) : m_error(error) { }
     virtual ~XArchEvalWindows() { }
 
-    virtual std::string    eval() const;
+    virtual std::string    eval() const noexcept;
 
 private:
     DWORD                m_error;
@@ -42,7 +42,7 @@ public:
     XArchEvalWinsock(int error) : m_error(error) { }
     virtual ~XArchEvalWinsock() { }
 
-    virtual std::string    eval() const;
+    virtual std::string    eval() const noexcept;
 
 private:
     int                    m_error;

src/lib/barrier/PlatformScreen.h

@@ -20,6 +20,7 @@
 
 #include "barrier/IPlatformScreen.h"
 #include "barrier/DragInformation.h"
+#include <stdexcept>
 
 //! Base screen implementation
 /*!

src/lib/base/IEventQueue.h

@@ -20,6 +20,7 @@
 
 #include "common/IInterface.h"
 #include "base/Event.h"
+#include <string>
 
 class IEventJob;
 class IEventQueueBuffer;

src/lib/platform/MSWindowsDesks.cpp

@@ -902,7 +902,7 @@ MSWindowsDesks::closeDesktop(HDESK desk)
 std::string MSWindowsDesks::getDesktopName(HDESK desk)
 {
     if (desk == NULL) {
-        return {}
+        return {};
     }
     else {
         DWORD size;

src/lib/platform/MSWindowsUtil.cpp

@@ -19,6 +19,7 @@
 #include "platform/MSWindowsUtil.h"
 
 #include <stdio.h>
+#include "base/String.h"
 
 //
 // MSWindowsUtil

src/test/integtests/platform/MSWindowsKeyStateTests.cpp

@@ -40,7 +40,6 @@ class MSWindowsKeyStateTests : public ::testing::Test
 protected:
 	virtual void SetUp()
 	{
-		m_hook.loadLibrary();
 		m_screensaver = new MSWindowsScreenSaver();
 	}