From acc10ae1e465b03a20e5aa7139591b55af984d6a Mon Sep 17 00:00:00 2001 From: Louis Brunner Date: Wed, 14 May 2014 21:32:45 +0200 Subject: [PATCH] Compatibility fix on Linux --- Network/Makefile | 3 ++- Vriska/Network/Server.h | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Network/Makefile b/Network/Makefile index 88fd9a1..e713f80 100644 --- a/Network/Makefile +++ b/Network/Makefile @@ -25,7 +25,8 @@ SRC = $(DIR_SOURCE)/Core/Logger.cpp \ $(DIR_SOURCE)/Socket/SocketClient.cpp \ $(DIR_SOURCE)/Network/Server.cpp \ $(DIR_SOURCE)/Network/SimpleClient.cpp \ - $(DIR_SOURCE)/Network/Client.cpp + $(DIR_SOURCE)/Network/Client.cpp \ + $(DIR_SOURCE)/Network/BlockingClient.cpp OBJ = $(SRC:.cpp=.o) diff --git a/Vriska/Network/Server.h b/Vriska/Network/Server.h index 3834113..8786bc8 100644 --- a/Vriska/Network/Server.h +++ b/Vriska/Network/Server.h @@ -24,7 +24,7 @@ namespace Vriska public: class VRISKA_EXPORT Client : public SimpleClient { - friend Server; + friend class Server; public: Client(INativeSocket& sysSocket, Server& server, unsigned int n); @@ -50,7 +50,7 @@ namespace Vriska }; private: - friend Client; + friend class Client; public: typedef bool (*FunctionC)(Server&, Client&);