Fix build on Windows

This commit is contained in:
GeorgH93 2020-06-03 15:48:44 +02:00
parent 0a1f080231
commit 64a9320d61
No known key found for this signature in database
GPG Key ID: D1630D37F9E4B3C8
8 changed files with 8 additions and 4 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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