diff options
| author |  Attila Molnar | 2013-05-15 13:48:02 -0700 |
|---|---|---|
| committer | Attila Molnar | 2013-05-15 13:48:02 -0700 |
| commit | 4b41feea830fc84e8c1b2fd0982f3e8d8840af96 (patch) | |
| tree | d9cf047483dd4bf6c21c9465ae51e842ca1e7b50 /src/modules/m_httpd.cpp | |
| parent | Merge pull request #531 from SaberUK/master+snprintf-removal (diff) | |
| parent | Tidy up keywords on module methods. (diff) | |
Merge pull request #514 from SaberUK/master+virtual-cleanup
Remove virtual keyword from a ton of methods which don't need it, introduce CXX11_OVERRIDE.
Diffstat (limited to 'src/modules/m_httpd.cpp')
| -rw-r--r-- | src/modules/m_httpd.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp index d768a9436..a1dedec57 100644 --- a/src/modules/m_httpd.cpp +++ b/src/modules/m_httpd.cpp @@ -68,7 +68,7 @@ class HttpServerSocket : public BufferedSocket GetIOHook()->OnStreamSocketAccept(this, client, server); } - virtual void OnError(BufferedSocketError) + void OnError(BufferedSocketError) CXX11_OVERRIDE { ServerInstance->GlobalCulls.AddItem(this); } @@ -335,13 +335,13 @@ class ModuleHttpServer : public Module std::vector<HttpServerSocket *> httpsocks; public: - void init() + void init() CXX11_OVERRIDE { HttpModule = this; ServerInstance->Modules->Attach(I_OnAcceptConnection, this); } - void OnRequest(Request& request) + void OnRequest(Request& request) CXX11_OVERRIDE { if (strcmp(request.id, "HTTP-DOC") != 0) return; @@ -350,7 +350,7 @@ class ModuleHttpServer : public Module resp.src.sock->Page(resp.document, resp.responsecode, &resp.headers); } - ModResult OnAcceptConnection(int nfd, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) + ModResult OnAcceptConnection(int nfd, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) CXX11_OVERRIDE { if (from->bind_tag->getString("type") != "httpd") return MOD_RES_PASSTHRU; @@ -361,7 +361,7 @@ class ModuleHttpServer : public Module return MOD_RES_ALLOW; } - virtual ~ModuleHttpServer() + ~ModuleHttpServer() { for (size_t i = 0; i < httpsocks.size(); i++) { @@ -370,7 +370,7 @@ class ModuleHttpServer : public Module } } - virtual Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { return Version("Provides HTTP serving facilities to modules", VF_VENDOR); } |