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/network_content.h | |
parent | 6570f7989f5c1fc5a1276505a8e6efce7838efd9 (diff) | |
download | openttd-c01a2e2a81d8e7bcd47d46292ed0b7d452081c31.tar.xz |
Codechange: Removed SmallVector completely
Diffstat (limited to 'src/network/network_content.h')
-rw-r--r-- | src/network/network_content.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/network/network_content.h b/src/network/network_content.h index 26300c4ca..e62c921e6 100644 --- a/src/network/network_content.h +++ b/src/network/network_content.h @@ -16,9 +16,9 @@ #include "core/tcp_http.h" /** Vector with content info */ -typedef SmallVector<ContentInfo *, 16> ContentVector; +typedef std::vector<ContentInfo *> ContentVector; /** Vector with constant content info */ -typedef SmallVector<const ContentInfo *, 16> ConstContentVector; +typedef std::vector<const ContentInfo *> ConstContentVector; /** Iterator for the content vector */ typedef ContentInfo **ContentIterator; @@ -66,11 +66,11 @@ struct ContentCallback { */ class ClientNetworkContentSocketHandler : public NetworkContentSocketHandler, ContentCallback, HTTPCallback { protected: - typedef SmallVector<ContentID, 4> ContentIDList; ///< List of content IDs to (possibly) select. - SmallVector<ContentCallback *, 2> callbacks; ///< Callbacks to notify "the world" + 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 - SmallVector<char, 1024> http_response; ///< The HTTP response to the requests we've been doing + 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 |