Renamed types.hpp to transport_address.hpp.

src/network/network.cpp

@@ -21,6 +21,7 @@
 #include "config/user_config.hpp"
 #include "io/file_manager.hpp"
 #include "network/network_string.hpp"
+#include "network/transport_address.hpp"
 #include "utils/time.hpp"
 
 #include <string.h>

src/network/network.hpp

@@ -22,8 +22,8 @@
 #ifndef HEADER_NETWORK_HPP
 #define HEADER_NETWORK_HPP
 
-#include "network/types.hpp"
 #include "utils/synchronised.hpp"
+#include "utils/types.hpp"
 
 // enet.h includes win32.h, which without lean_and_mean includes
 // winspool.h, which defines MAX_PRIORITY as a macro, which then
@@ -31,7 +31,10 @@
 #define WIN32_LEAN_AND_MEAN
 #include <enet/enet.h>
 
+#include <stdio.h>
+
 class NetworkString;
+class TransportAddress;
 
 /** \class EnetHost
  *  A small wrapper around enet to allow sending and receiving

src/network/protocol.hpp

@@ -24,7 +24,6 @@
 #define PROTOCOL_HPP
 
 #include "network/network_string.hpp"
-#include "network/types.hpp"
 #include "utils/leak_check.hpp"
 #include "utils/no_copy.hpp"
 #include "utils/types.hpp"

src/network/protocols/client_lobby_room_protocol.hpp

@@ -2,7 +2,7 @@
 #define CLIENT_LOBBY_ROOM_PROTOCOL_HPP
 
 #include "network/protocols/lobby_room_protocol.hpp"
-#include "network/types.hpp"
+#include "network/transport_address.hpp"
 
 class STKPeer;
 

src/network/protocols/connect_to_peer.hpp

@@ -20,7 +20,7 @@
 #define CONNECT_TO_SERVER_HPP
 
 #include "network/protocol.hpp"
-#include "network/types.hpp"
+#include "network/transport_address.hpp"
 #include "utils/cpp2011.hpp"
 
 #include <string>

src/network/protocols/connect_to_server.hpp

@@ -20,7 +20,7 @@
 #define CONNECT_TO_SERVER_HPP
 
 #include "network/protocol.hpp"
-#include "network/types.hpp"
+#include "network/transport_address.hpp"
 #include "utils/cpp2011.hpp"
 #include <string>
 

src/network/protocols/get_peer_address.hpp

@@ -20,6 +20,7 @@
 #define GET_PEER_ADDRESS_HPP
 
 #include "network/protocol.hpp"
+#include "network/transport_address.hpp"
 
 namespace Online { class XMLRequest; }
 

src/network/protocols/ping_protocol.hpp

@@ -2,7 +2,7 @@
 #define PING_PROTOCOL_HPP
 
 #include "network/protocol.hpp"
-
+#include "network/transport_address.hpp"
 
 class PingProtocol : public Protocol
 {

src/network/stk_host.hpp

@@ -24,7 +24,7 @@
 
 #include "network/network.hpp"
 #include "network/network_string.hpp"
-#include "network/types.hpp"
+#include "network/transport_address.hpp"
 #include "utils/synchronised.hpp"
 
 // enet.h includes win32.h, which without lean_and_mean includes

src/network/stk_peer.cpp

@@ -19,7 +19,7 @@
 #include "network/stk_peer.hpp"
 #include "network/game_setup.hpp"
 #include "network/network_string.hpp"
-#include "network/types.hpp"
+#include "network/transport_address.hpp"
 #include "utils/log.hpp"
 
 #include <string.h>

src/network/transport_address.hpp

@@ -19,8 +19,8 @@
 /*! \file types.hpp
  *  \brief Declares the general types that are used by the network.
  */
-#ifndef HEADER_NETWORK_TYPES_HPP
+#ifndef HEADER_TRANSPORT_ADDRESS_HPP
-#define HEADER_NETWORK_TYPES_HPP
+#define HEADER_TRANSPORT_ADDRESS_HPP
 
 #include "utils/no_copy.hpp"
 #include "utils/string_utils.hpp"