Use the override specifier when overriding

diff --git a/source/http/request.h b/source/http/request.h
index ec5030e7e543b6e04c004df30f4ddf8937add09d..979c7859727c1e5b009bedac806d915da0a6190b 100644 (file)
--- a/source/http/request.h
+++ b/source/http/request.h
@@ -17,7 +17,7 @@ public:
        Request(const std::string &, const std::string &);
        const std::string &get_method() const { return method; }
        const std::string &get_path() const { return path; }
-       virtual std::string str() const;
+       std::string str() const override;
 
        static Request parse(const std::string &);
        static Request from_url(const std::string &);

diff --git a/source/http/response.h b/source/http/response.h
index 8d88c92875f99fc2229cf5f7458c957b81cac2d4..f7c6812c46c9be4472ab18fcd642a52568f44991 100644 (file)
--- a/source/http/response.h
+++ b/source/http/response.h
@@ -16,7 +16,7 @@ private:
 public:
        Response(Status);
        Status get_status() const { return status; }
-       virtual std::string str() const;
+       std::string str() const override;
 
        static Response parse(const std::string &);
 };

diff --git a/source/http/submessage.h b/source/http/submessage.h
index 9cf4d2cff104bcc64bb8c1a4f90189358f2c5086..7ef9e376ddb5334f6e39daa69572c2852b29c2ab 100644 (file)
--- a/source/http/submessage.h
+++ b/source/http/submessage.h
@@ -12,7 +12,7 @@ private:
        SubMessage() = default;
 
 public:
-       virtual std::string str() const;
+       std::string str() const override;
 
        static SubMessage parse(const std::string &);
 };

diff --git a/source/net/clientsocket.h b/source/net/clientsocket.h
index ab8332235cabbaaa5144def7a049214cc9069244..672c32bc98fca3f570d7b3b31948debcb2f434f4 100644 (file)
--- a/source/net/clientsocket.h
+++ b/source/net/clientsocket.h
@@ -42,8 +42,8 @@ public:
 
        const SockAddr &get_peer_address() const;
 protected:
-       virtual std::size_t do_write(const char *, std::size_t);
-       virtual std::size_t do_read(char *, std::size_t);
+       std::size_t do_write(const char *, std::size_t) override;
+       std::size_t do_read(char *, std::size_t) override;
 };
 
 } // namespace Net

diff --git a/source/net/communicator.cpp b/source/net/communicator.cpp
index f74f4d3f3c831bfdf42c414e4cffdbde111781ab..05ef0ea86e0f4e9a6f6710864537a800e61ff663 100644 (file)
--- a/source/net/communicator.cpp
+++ b/source/net/communicator.cpp
@@ -35,7 +35,7 @@ private:
 public:
        HandshakeReceiver();
        uint64_t get_hash() const { return hash; }
-       virtual void receive(const Handshake &);
+       void receive(const Handshake &) override;
 };
 
 HandshakeReceiver::HandshakeReceiver():

diff --git a/source/net/datagramsocket.h b/source/net/datagramsocket.h
index 678a844b83fd9be16e139f49c8d59a1de4fddbea..e5ded78623223fd9ef2bfaf4894b71ca8f02c01a 100644 (file)
--- a/source/net/datagramsocket.h
+++ b/source/net/datagramsocket.h
@@ -11,8 +11,8 @@ class DatagramSocket: public ClientSocket
 public:
        DatagramSocket(Family, int = 0);
 
-       virtual bool connect(const SockAddr &);
-       virtual bool poll_connect(const Time::TimeDelta &) { return false; }
+       bool connect(const SockAddr &) override;
+       bool poll_connect(const Time::TimeDelta &) override { return false; }
 
        std::size_t sendto(const char *, std::size_t, const SockAddr &);
        std::size_t recvfrom(char *, std::size_t, SockAddr *&);

diff --git a/source/net/inet.h b/source/net/inet.h
index 639e64cbb1eca5ec8c9fc2e0d5247c91600adf38..67bb6100b66005191d923d3a4210a9ea82d4cd79 100644 (file)
--- a/source/net/inet.h
+++ b/source/net/inet.h
@@ -19,13 +19,13 @@ public:
        InetAddr();
        InetAddr(const SysAddr &);
 
-       virtual InetAddr *copy() const { return new InetAddr(*this); }
+       InetAddr *copy() const override { return new InetAddr(*this); }
 
-       virtual SysAddr to_sys() const;
+       SysAddr to_sys() const override;
 
-       virtual Family get_family() const { return INET; }
+       Family get_family() const override { return INET; }
        unsigned get_port() const { return port; }
-       virtual std::string str() const;
+       std::string str() const override;
 };
 
 } // namespace Net

diff --git a/source/net/inet6.h b/source/net/inet6.h
index cc33e764936e4dbaaa4df8311774f6132407bbff..fb07eec52e2d2ff14dcaa551fff7eef38468a840 100644 (file)
--- a/source/net/inet6.h
+++ b/source/net/inet6.h
@@ -16,13 +16,13 @@ public:
        Inet6Addr();
        Inet6Addr(const SysAddr &);
 
-       virtual Inet6Addr *copy() const { return new Inet6Addr(*this); }
+       Inet6Addr *copy() const override { return new Inet6Addr(*this); }
 
-       virtual SysAddr to_sys() const;
+       SysAddr to_sys() const override;
 
-       virtual Family get_family() const { return INET6; }
+       Family get_family() const override { return INET6; }
        unsigned get_port() const { return port; }
-       virtual std::string str() const;
+       std::string str() const override;
 };
 
 } // namespace Net

diff --git a/source/net/protocol.h b/source/net/protocol.h
index aca3ca8c1acba8698becd5bd637da570530d7e67..ff18e85f905b83852a3dba5f5816032e4ae3b2da 100644 (file)
--- a/source/net/protocol.h
+++ b/source/net/protocol.h
@@ -50,9 +50,9 @@ private:
 
                CompoundDef(const S &);
 
-               virtual std::string describe() const;
-               virtual char *serialize(const C &, char *, char *) const;
-               virtual const char *deserialize(C &, const char *, const char *) const;
+               std::string describe() const override;
+               char *serialize(const C &, char *, char *) const override;
+               const char *deserialize(C &, const char *, const char *) const override;
        };
 
        template<typename T>
@@ -183,17 +183,17 @@ private:
                PacketTypeDef(unsigned);
                ~PacketTypeDef();
 
-               virtual unsigned get_class_id() const { return get_packet_class_id<P>(); }
+               unsigned get_class_id() const override { return get_packet_class_id<P>(); }
 
                template<typename S>
                void set_serializer(const S &);
 
                const CompoundTypeDef<P> &get_compound() const { return *compound; }
 
-               virtual std::string describe() const { return compound->describe(); }
+               std::string describe() const override { return compound->describe(); }
                char *serialize(const P &, char *, char *) const;
                const char *deserialize(P &, const char *, const char *) const;
-               virtual const char *dispatch(ReceiverBase &, const char *, const char *) const;
+               const char *dispatch(ReceiverBase &, const char *, const char *) const override;
        };
 
        template<typename P, typename S>

diff --git a/source/net/resolve.h b/source/net/resolve.h
index 5e7781dfc64a3e66bf16d1b02c8beed05aaefc83..b006aff9986b7c5cf51ea5638fdcca6b53693e27 100644 (file)
--- a/source/net/resolve.h
+++ b/source/net/resolve.h
@@ -68,7 +68,7 @@ private:
                IO::Pipe &get_notify_pipe() { return notify_pipe; }
 
        private:
-               virtual void main();
+               void main() override;
        };
 
 public:

diff --git a/source/net/serversocket.h b/source/net/serversocket.h
index dd892e02c446a1637e2afb525d4e7b68af2eaaf5..48ab9bab441172f62b3ba0f94c418bbfb034b9eb 100644 (file)
--- a/source/net/serversocket.h
+++ b/source/net/serversocket.h
@@ -22,8 +22,8 @@ public:
 
        virtual ClientSocket *accept() = 0;
 protected:
-       virtual std::size_t do_write(const char *, std::size_t);
-       virtual std::size_t do_read(char *, std::size_t);
+       std::size_t do_write(const char *, std::size_t) override;
+       std::size_t do_read(char *, std::size_t) override;
 };
 
 } // namespace Net

diff --git a/source/net/socket.h b/source/net/socket.h
index 2e736e9a21d04ffaac1f77a704ae50f3f4ed056b..d917bd8e37e9d1b9a7d81adbfbc98053d6738406 100644 (file)
--- a/source/net/socket.h
+++ b/source/net/socket.h
@@ -41,10 +41,10 @@ private:
 public:
        ~Socket();
 
-       virtual void set_block(bool);
-       virtual void set_inherit(bool);
+       void set_block(bool) override;
+       void set_inherit(bool) override;
        const IO::Handle &get_handle(IO::Mode);
-       virtual const IO::Handle &get_event_handle();
+       const IO::Handle &get_event_handle() override;
 
        /** Associates the socket with a local address.  There must be no existing
        users of the address. */

diff --git a/source/net/streamserversocket.h b/source/net/streamserversocket.h
index 315226566e35277055fadece93c48904b6359132..d38c2eb9c06851f3c48c9819ed70579742b5e477 100644 (file)
--- a/source/net/streamserversocket.h
+++ b/source/net/streamserversocket.h
@@ -15,9 +15,9 @@ private:
 public:
        StreamServerSocket(Family, int = 0);
 
-       virtual void listen(const SockAddr &, unsigned = 4);
+       void listen(const SockAddr &, unsigned = 4) override;
        bool is_listening() const { return listening; }
-       virtual StreamSocket *accept();
+       StreamSocket *accept() override;
 };
 
 } // namespace Net

diff --git a/source/net/streamsocket.h b/source/net/streamsocket.h
index 8b39e91afd358214168c977e299e01bc714d3e76..b6d43b5abc227770587c19d199f49f8ebf66291e 100644 (file)
--- a/source/net/streamsocket.h
+++ b/source/net/streamsocket.h
@@ -23,9 +23,9 @@ public:
        If the socket is non-blocking, this function may return before the
        connection is fully established.  The caller must then use either the
        poll_connect function or an EventDispatcher to finish the process. */
-       virtual bool connect(const SockAddr &);
+       bool connect(const SockAddr &) override;
 
-       virtual bool poll_connect(const Time::TimeDelta &);
+       bool poll_connect(const Time::TimeDelta &) override;
 
 private:
        void on_event(IO::PollEvent);

diff --git a/source/net/unix.h b/source/net/unix.h
index 821e915f0154d814163621ee4e47371ff70daf96..ec65164fbd0372ca62a8ea4bd28a25729403a099 100644 (file)
--- a/source/net/unix.h
+++ b/source/net/unix.h
@@ -17,12 +17,12 @@ public:
        UnixAddr(const SysAddr &);
        UnixAddr(const std::string &, bool = false);
 
-       virtual UnixAddr *copy() const { return new UnixAddr(*this); }
+       UnixAddr *copy() const override { return new UnixAddr(*this); }
 
-       virtual SysAddr to_sys() const;
+       SysAddr to_sys() const override;
 
-       virtual Family get_family() const { return UNIX; }
-       virtual std::string str() const;
+       Family get_family() const override { return UNIX; }
+       std::string str() const override;
 };
 
 } // namespace Net