Change ServerInfo::gecos to description

[user/henk/code/inspircd.git] / include / inspsocket.h

diff --git a/include/inspsocket.h b/include/inspsocket.h
index 751374fdf1aab978bfeae12e45c3ade7881359d2..addb761d119037c510eed2021972fc52ba9a513f 100644 (file)
--- a/include/inspsocket.h
+++ b/include/inspsocket.h
@@ -88,13 +88,17 @@ class CoreExport SocketTimeout : public Timer
         * @param fd File descriptor of BufferedSocket
         * @param thesock BufferedSocket to attach to
         * @param secs_from_now Seconds from now to time out
-        * @param now The current time
         */
-       SocketTimeout(int fd, BufferedSocket* thesock, long secs_from_now) : Timer(secs_from_now), sock(thesock), sfd(fd) { }
+       SocketTimeout(int fd, BufferedSocket* thesock, unsigned int secs_from_now)
+               : Timer(secs_from_now)
+               , sock(thesock)
+               , sfd(fd)
+       {
+       }
 
        /** Handle tick event
         */
-       virtual bool Tick(time_t now);
+       bool Tick(time_t now) CXX11_OVERRIDE;
 };
 
 /**
@@ -312,7 +316,7 @@ class CoreExport StreamSocket : public EventHandler
         */
        virtual void Close();
        /** This ensures that close is called prior to destructor */
-       virtual CullResult cull();
+       CullResult cull() CXX11_OVERRIDE;
 
        /** Get the IOHook of a module attached to this socket
         * @param mod Module whose IOHook to return
@@ -362,7 +366,7 @@ class CoreExport BufferedSocket : public StreamSocket
         * @param maxtime Time to wait for connection
         * @param connectbindip Address to bind to (if NULL, no bind will be done)
         */
-       void DoConnect(const std::string &ipaddr, int aport, unsigned long maxtime, const std::string &connectbindip);
+       void DoConnect(const std::string& ipaddr, int aport, unsigned int maxtime, const std::string& connectbindip);
 
        /** This method is called when an outbound connection on your socket is
         * completed.
@@ -372,7 +376,7 @@ class CoreExport BufferedSocket : public StreamSocket
        /** When there is data waiting to be read on a socket, the OnDataReady()
         * method is called.
         */
-       virtual void OnDataReady() = 0;
+       void OnDataReady() CXX11_OVERRIDE = 0;
 
        /**
         * When an outbound connection fails, and the attempt times out, you
@@ -388,8 +392,8 @@ class CoreExport BufferedSocket : public StreamSocket
        virtual ~BufferedSocket();
  protected:
        void OnEventHandlerWrite() CXX11_OVERRIDE;
-       BufferedSocketError BeginConnect(const irc::sockets::sockaddrs& dest, const irc::sockets::sockaddrs& bind, unsigned long timeout);
-       BufferedSocketError BeginConnect(const std::string &ipaddr, int aport, unsigned long maxtime, const std::string &connectbindip);
+       BufferedSocketError BeginConnect(const irc::sockets::sockaddrs& dest, const irc::sockets::sockaddrs& bind, unsigned int timeout);
+       BufferedSocketError BeginConnect(const std::string& ipaddr, int aport, unsigned int maxtime, const std::string& connectbindip);
 };
 
 inline IOHook* StreamSocket::GetIOHook() const { return iohook; }