Merge pull request #732 from GeorgH93/master

Fix build on Windows
This commit is contained in:
Povilas Kanapickas 2020-06-05 00:25:33 +03:00 committed by GitHub
commit 8df50c734f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 12 additions and 4 deletions

View File

@ -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%

View File

@ -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>

View File

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

View File

@ -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;

View File

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

View File

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

View File

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

View File

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

View File

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