diff options
| author | Henry Wilson <m3henry@googlemail.com> | 2019-03-04 20:49:33 +0000 |
|---|---|---|
| committer | PeterN <peter@fuzzle.org> | 2019-03-26 20:15:57 +0000 |
| commit | cc62f4163f230ed82ef3b04187987d3e380cd570 (patch) | |
| tree | c4e271f72ae231d9934f215624054d605665ca6c /src/network | |
| parent | c01a2e2a81d8e7bcd47d46292ed0b7d452081c31 (diff) | |
| download | openttd-cc62f4163f230ed82ef3b04187987d3e380cd570.tar.xz | |
Cleanup: Remove unused size template parameters from SmallMap and Auto[Free|Delete]SmallVector
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/core/address.h | 2 | ||||
| -rw-r--r-- | src/network/network_client.cpp | 2 | ||||
| -rw-r--r-- | src/network/network_content.h | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/network/core/address.h b/src/network/core/address.h index f6d7870bf..2f26a3d00 100644 --- a/src/network/core/address.h +++ b/src/network/core/address.h @@ -19,7 +19,7 @@ class NetworkAddress; 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. +typedef SmallMap<NetworkAddress, SOCKET> SocketList; ///< Type for a mapping between address and socket. /** * Wrapper for (un)resolved network addresses; there's no reason to transform diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp index 12aa3fc0a..7b658e8b5 100644 --- a/src/network/network_client.cpp +++ b/src/network/network_client.cpp @@ -41,7 +41,7 @@ struct PacketReader : LoadFilter { static const size_t CHUNK = 32 * 1024; ///< 32 KiB chunks of memory. - AutoFreeSmallVector<byte *, 16> blocks; ///< Buffer with blocks of allocated memory. + AutoFreeSmallVector<byte *> blocks; ///< Buffer with blocks of allocated memory. byte *buf; ///< Buffer we're going to write to/read from. byte *bufe; ///< End of the buffer we write to/read from. byte **block; ///< The block we're reading from/writing to. diff --git a/src/network/network_content.h b/src/network/network_content.h index e62c921e6..29a25f259 100644 --- a/src/network/network_content.h +++ b/src/network/network_content.h @@ -67,11 +67,11 @@ struct ContentCallback { class ClientNetworkContentSocketHandler : public NetworkContentSocketHandler, ContentCallback, HTTPCallback { protected: typedef std::vector<ContentID> ContentIDList; ///< List of content IDs to (possibly) select. - std::vector<ContentCallback *> callbacks; ///< Callbacks to notify "the world" - ContentIDList requested; ///< ContentIDs we already requested (so we don't do it again) - ContentVector infos; ///< All content info we received - std::vector<char> http_response; ///< The HTTP response to the requests we've been doing - int http_response_index; ///< Where we are, in the response, with handling it + std::vector<ContentCallback *> callbacks; ///< Callbacks to notify "the world" + ContentIDList requested; ///< ContentIDs we already requested (so we don't do it again) + ContentVector infos; ///< All content info we received + std::vector<char> http_response; ///< The HTTP response to the requests we've been doing + int http_response_index; ///< Where we are, in the response, with handling it FILE *curFile; ///< Currently downloaded file ContentInfo *curInfo; ///< Information about the currently downloaded file |