Fix TcpSocket for Linux compilers (OpenRCT2#13)

LRFLEW · Jun 2, 2016 · e3d04ff · e3d04ff
1 parent 8dfbabb
commit e3d04ff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/network/NetworkConnection.cpp b/src/network/NetworkConnection.cpp
@@ -16,7 +16,7 @@
 
 #ifndef DISABLE_NETWORK
 
-#include "Network.h"
+#include "network.h"
 #include "NetworkConnection.h"
 #include "../core/String.hpp"
 #include <SDL.h>

diff --git a/src/network/TcpSocket.cpp b/src/network/TcpSocket.cpp
@@ -74,7 +74,7 @@ class SocketException : public Exception
 
 struct ConnectRequest
 {
-    TcpSocket * TcpSocket;
+    TcpSocket * Socket;
     std::string Address;
     uint16      Port;
 };
@@ -309,23 +309,23 @@ class TcpSocket : public ITcpSocket
         {
             // Spin off a worker thread for resolving the address
             auto req = new ConnectRequest();
-            req->TcpSocket = this;
+            req->Socket = this;
             req->Address = std::string(address);
             req->Port = port;
             SDL_CreateThread([](void * pointer) -> int
             {
                 auto req = (ConnectRequest *)pointer;
                 try
                 {
-                    req->TcpSocket->Connect(req->Address.c_str(), req->Port);
+                    req->Socket->Connect(req->Address.c_str(), req->Port);
                 }
                 catch (Exception ex)
                 {
-                    req->TcpSocket->_error = std::string(ex.GetMsg());
+                    req->Socket->_error = std::string(ex.GetMsg());
                 }
                 delete req;
- 
-                SDL_UnlockMutex(req->TcpSocket->_connectMutex);
+
+                SDL_UnlockMutex(req->Socket->_connectMutex);
                 return 0;
             }, 0, req);
         }
@@ -386,7 +386,7 @@ class TcpSocket : public ITcpSocket
         }
     }
 
-    void Close()
+    void Close() override
     {
         SDL_LockMutex(_connectMutex);
         {