diff options
| author | Henry Wilson <m3henry@googlemail.com> | 2019-03-03 17:30:09 +0000 |
|---|---|---|
| committer | PeterN <peter@fuzzle.org> | 2019-03-26 20:15:57 +0000 |
| commit | c01a2e2a81d8e7bcd47d46292ed0b7d452081c31 (patch) | |
| tree | b38441ec8469136a6a2252f8c856d22f14ee689e /src/network/core | |
| parent | 6570f7989f5c1fc5a1276505a8e6efce7838efd9 (diff) | |
| download | openttd-c01a2e2a81d8e7bcd47d46292ed0b7d452081c31.tar.xz | |
Codechange: Removed SmallVector completely
Diffstat (limited to 'src/network/core')
| -rw-r--r-- | src/network/core/address.h | 2 | ||||
| -rw-r--r-- | src/network/core/tcp_connect.cpp | 2 | ||||
| -rw-r--r-- | src/network/core/tcp_http.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/network/core/address.h b/src/network/core/address.h index b5c78c79b..f6d7870bf 100644 --- a/src/network/core/address.h +++ b/src/network/core/address.h @@ -18,7 +18,7 @@ #include "../../core/smallmap_type.hpp" class NetworkAddress; -typedef SmallVector<NetworkAddress, 4> NetworkAddressList; ///< Type for a list of addresses. +typedef std::vector<NetworkAddress> NetworkAddressList; ///< Type for a list of addresses. typedef SmallMap<NetworkAddress, SOCKET, 4> SocketList; ///< Type for a mapping between address and socket. /** diff --git a/src/network/core/tcp_connect.cpp b/src/network/core/tcp_connect.cpp index d699cf60d..d76042821 100644 --- a/src/network/core/tcp_connect.cpp +++ b/src/network/core/tcp_connect.cpp @@ -19,7 +19,7 @@ #include "../../safeguards.h" /** List of connections that are currently being created */ -static SmallVector<TCPConnecter *, 1> _tcp_connecters; +static std::vector<TCPConnecter *> _tcp_connecters; /** * Create a new connecter for the given address diff --git a/src/network/core/tcp_http.cpp b/src/network/core/tcp_http.cpp index cec77fb14..3e9cc8141 100644 --- a/src/network/core/tcp_http.cpp +++ b/src/network/core/tcp_http.cpp @@ -21,7 +21,7 @@ #include "../../safeguards.h" /** List of open HTTP connections. */ -static SmallVector<NetworkHTTPSocketHandler *, 1> _http_connections; +static std::vector<NetworkHTTPSocketHandler *> _http_connections; /** * Start the querying |