summaryrefslogtreecommitdiff
path: root/src/network
diff options
context:
space:
mode:
authorHenry Wilson <m3henry@googlemail.com>2018-09-20 23:44:14 +0100
committerPeterN <peter@fuzzle.org>2019-03-26 20:15:57 +0000
commitbfd79e59dc34314a089a0024af56d04d84456ebd (patch)
treed03559bac7a8c3f1d260cead2ed77791c03d37a5 /src/network
parent4b349c0f90c3f7b6a39171cec41cd98dcd0d88b7 (diff)
downloadopenttd-bfd79e59dc34314a089a0024af56d04d84456ebd.tar.xz
Codechange: Replace SmallVector::Clear() with std::vector::clear()
Diffstat (limited to 'src/network')
-rw-r--r--src/network/core/tcp_listen.h2
-rw-r--r--src/network/core/udp.cpp2
-rw-r--r--src/network/network_content.cpp8
-rw-r--r--src/network/network_content_gui.cpp2
-rw-r--r--src/network/network_gui.cpp2
-rw-r--r--src/network/network_udp.cpp2
6 files changed, 9 insertions, 9 deletions
diff --git a/src/network/core/tcp_listen.h b/src/network/core/tcp_listen.h
index 21bcaea3c..b9f987190 100644
--- a/src/network/core/tcp_listen.h
+++ b/src/network/core/tcp_listen.h
@@ -164,7 +164,7 @@ public:
for (SocketList::iterator s = sockets.Begin(); s != sockets.End(); s++) {
closesocket(s->second);
}
- sockets.Clear();
+ sockets.clear();
DEBUG(net, 1, "[%s] closed listeners", Tsocket::GetName());
}
};
diff --git a/src/network/core/udp.cpp b/src/network/core/udp.cpp
index 4a2f77368..83c14d2b0 100644
--- a/src/network/core/udp.cpp
+++ b/src/network/core/udp.cpp
@@ -62,7 +62,7 @@ void NetworkUDPSocketHandler::Close()
for (SocketList::iterator s = this->sockets.Begin(); s != this->sockets.End(); s++) {
closesocket(s->second);
}
- this->sockets.Clear();
+ this->sockets.clear();
}
NetworkRecvStatus NetworkUDPSocketHandler::CloseConnection(bool error)
diff --git a/src/network/network_content.cpp b/src/network/network_content.cpp
index 786f1c04a..0ef060628 100644
--- a/src/network/network_content.cpp
+++ b/src/network/network_content.cpp
@@ -981,7 +981,7 @@ void ClientNetworkContentSocketHandler::CheckDependencyState(ContentInfo *ci)
if (c->state != ContentInfo::AUTOSELECTED) continue;
/* Only unselect when WE are the only parent. */
- parents.Clear();
+ parents.clear();
this->ReverseLookupDependency(parents, c);
/* First check whether anything depends on us */
@@ -1000,7 +1000,7 @@ void ClientNetworkContentSocketHandler::CheckDependencyState(ContentInfo *ci)
if (force_selection) continue;
/* "Flood" search to find all items in the dependency graph*/
- parents.Clear();
+ parents.clear();
this->ReverseLookupTreeDependency(parents, c);
/* Is there anything that is "force" selected?, if so... we're done. */
@@ -1033,8 +1033,8 @@ void ClientNetworkContentSocketHandler::Clear()
{
for (ContentIterator iter = this->infos.Begin(); iter != this->infos.End(); iter++) delete *iter;
- this->infos.Clear();
- this->requested.Clear();
+ this->infos.clear();
+ this->requested.clear();
}
/*** CALLBACK ***/
diff --git a/src/network/network_content_gui.cpp b/src/network/network_content_gui.cpp
index 406c6aa05..2ac7e6b12 100644
--- a/src/network/network_content_gui.cpp
+++ b/src/network/network_content_gui.cpp
@@ -385,7 +385,7 @@ class NetworkContentListWindow : public Window, ContentCallback {
if (!this->content.NeedRebuild()) return;
/* Create temporary array of games to use for listing */
- this->content.Clear();
+ this->content.clear();
bool all_available = true;
diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp
index b12aaa823..1366906b8 100644
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -250,7 +250,7 @@ protected:
if (!this->servers.NeedRebuild()) return;
/* Create temporary array of games to use for listing */
- this->servers.Clear();
+ this->servers.clear();
for (NetworkGameList *ngl = _network_game_list; ngl != NULL; ngl = ngl->next) {
*this->servers.Append() = ngl;
diff --git a/src/network/network_udp.cpp b/src/network/network_udp.cpp
index cee230c88..b416ee98e 100644
--- a/src/network/network_udp.cpp
+++ b/src/network/network_udp.cpp
@@ -668,7 +668,7 @@ void NetworkUDPInitialize()
GetBindAddresses(&server, _settings_client.network.server_port);
_udp_server_socket = new ServerNetworkUDPSocketHandler(&server);
- server.Clear();
+ server.clear();
GetBindAddresses(&server, 0);
_udp_master_socket = new MasterNetworkUDPSocketHandler(&server);