Add 'override' keyword to methods

refs #9929

lib/base/exception.hpp

@@ -55,7 +55,7 @@ public:
 	ScriptError(const String& message, const DebugInfo& di, bool incompleteExpr = false);
 	~ScriptError(void) throw();
 
-	virtual const char *what(void) const throw();
+	virtual const char *what(void) const throw() override;
 
 	DebugInfo GetDebugInfo(void) const;
 	bool IsIncompleteExpression(void) const;
@@ -75,7 +75,7 @@ public:
 	ValidationError(const ConfigObject::Ptr& object, const std::vector<String>& attributePath, const String& message);
 	~ValidationError(void) throw();
 
-	virtual const char *what(void) const throw();
+	virtual const char *what(void) const throw() override;
 
 	ConfigObject::Ptr GetObject(void) const;
 	std::vector<String> GetAttributePath(void) const;
@@ -124,7 +124,7 @@ public:
 	posix_error(void);
 	virtual ~posix_error(void) throw();
 
-	virtual const char *what(void) const throw();
+	virtual const char *what(void) const throw() override;
 
 private:
 	mutable char *m_Message;

lib/base/fifo.hpp

@@ -41,13 +41,13 @@ public:
 	FIFO(void);
 	~FIFO(void);
 
-	virtual size_t Peek(void *buffer, size_t count, bool allow_partial = false);
-	virtual size_t Read(void *buffer, size_t count, bool allow_partial = false);
-	virtual void Write(const void *buffer, size_t count);
-	virtual void Close(void);
-	virtual bool IsEof(void) const;
-	virtual bool SupportsWaiting(void) const;
-	virtual bool IsDataAvailable(void) const;
+	virtual size_t Peek(void *buffer, size_t count, bool allow_partial = false) override;
+	virtual size_t Read(void *buffer, size_t count, bool allow_partial = false) override;
+	virtual void Write(const void *buffer, size_t count) override;
+	virtual void Close(void) override;
+	virtual bool IsEof(void) const override;
+	virtual bool SupportsWaiting(void) const override;
+	virtual bool IsDataAvailable(void) const override;
 
 	size_t GetAvailableBytes(void) const;
 

lib/base/networkstream.hpp

@@ -39,12 +39,12 @@ public:
 
 	NetworkStream(const Socket::Ptr& socket);
 
-	virtual size_t Read(void *buffer, size_t count, bool allow_partial = false);
-	virtual void Write(const void *buffer, size_t count);
+	virtual size_t Read(void *buffer, size_t count, bool allow_partial = false) override;
+	virtual void Write(const void *buffer, size_t count) override;
 
-	virtual void Close(void);
+	virtual void Close(void) override;
 
-	virtual bool IsEof(void) const;
+	virtual bool IsEof(void) const override;
 
 private:
 	Socket::Ptr m_Socket;

lib/base/primitivetype.hpp

@@ -32,15 +32,15 @@ class I2_BASE_API PrimitiveType : public Type
 public:
 	PrimitiveType(const String& name, const String& base, const ObjectFactory& factory = ObjectFactory());
 
-	virtual String GetName(void) const;
-	virtual Type::Ptr GetBaseType(void) const;
-	virtual int GetAttributes(void) const;
-	virtual int GetFieldId(const String& name) const;
-	virtual Field GetFieldInfo(int id) const;
-	virtual int GetFieldCount(void) const;
+	virtual String GetName(void) const override;
+	virtual Type::Ptr GetBaseType(void) const override;
+	virtual int GetAttributes(void) const override;
+	virtual int GetFieldId(const String& name) const override;
+	virtual Field GetFieldInfo(int id) const override;
+	virtual int GetFieldCount(void) const override;
 
 protected:
-	virtual ObjectFactory GetFactory(void) const;
+	virtual ObjectFactory GetFactory(void) const override;
 
 private:
 	String m_Name;

lib/base/stdiostream.hpp

@@ -34,13 +34,13 @@ public:
 	StdioStream(std::iostream *innerStream, bool ownsStream);
 	~StdioStream(void);
 
-	virtual size_t Read(void *buffer, size_t size, bool allow_partial = false);
-	virtual void Write(const void *buffer, size_t size);
+	virtual size_t Read(void *buffer, size_t size, bool allow_partial = false) override;
+	virtual void Write(const void *buffer, size_t size) override;
 
-	virtual void Close(void);
+	virtual void Close(void) override;
 
-	virtual bool IsDataAvailable(void) const;
-	virtual bool IsEof(void) const;
+	virtual bool IsDataAvailable(void) const override;
+	virtual bool IsEof(void) const override;
 
 private:
 	std::iostream *m_InnerStream;

lib/base/tlsstream.hpp

@@ -56,17 +56,17 @@ public:
 
 	void Handshake(void);
 
-	virtual void Close(void);
-	virtual void Shutdown(void);
+	virtual void Close(void) override;
+	virtual void Shutdown(void) override;
 
-	virtual size_t Peek(void *buffer, size_t count, bool allow_partial = false);
-	virtual size_t Read(void *buffer, size_t count, bool allow_partial = false);
-	virtual void Write(const void *buffer, size_t count);
+	virtual size_t Peek(void *buffer, size_t count, bool allow_partial = false) override;
+	virtual size_t Read(void *buffer, size_t count, bool allow_partial = false) override;
+	virtual void Write(const void *buffer, size_t count) override;
 
-	virtual bool IsEof(void) const;
+	virtual bool IsEof(void) const override;
 
-	virtual bool SupportsWaiting(void) const;
-	virtual bool IsDataAvailable(void) const;
+	virtual bool SupportsWaiting(void) const override;
+	virtual bool IsDataAvailable(void) const override;
 
 	bool IsVerifyOK(void) const;
 
@@ -93,7 +93,7 @@ private:
 	static int m_SSLIndex;
 	static bool m_SSLIndexInitialized;
 
-	virtual void OnEvent(int revents);
+	virtual void OnEvent(int revents) override;
 
 	void HandleError(void) const;
 

lib/base/type.hpp

@@ -114,17 +114,17 @@ class I2_BASE_API TypeType : public Type
 public:
 	DECLARE_PTR_TYPEDEFS(Type);
 
-	virtual String GetName(void) const;
-	virtual Type::Ptr GetBaseType(void) const;
-	virtual int GetAttributes(void) const;
-	virtual int GetFieldId(const String& name) const;
-	virtual Field GetFieldInfo(int id) const;
-	virtual int GetFieldCount(void) const;
+	virtual String GetName(void) const override;
+	virtual Type::Ptr GetBaseType(void) const override;
+	virtual int GetAttributes(void) const override;
+	virtual int GetFieldId(const String& name) const override;
+	virtual Field GetFieldInfo(int id) const override;
+	virtual int GetFieldCount(void) const override;
 	
 	static Object::Ptr GetPrototype(void);
 
 protected:
-	virtual ObjectFactory GetFactory(void) const;
+	virtual ObjectFactory GetFactory(void) const override;
 };
 
 template<typename T>

lib/cli/apisetupcommand.hpp

@@ -35,11 +35,11 @@ class ApiSetupCommand : public CLICommand
 public:
 	DECLARE_PTR_TYPEDEFS(ApiSetupCommand);
 
-	virtual String GetDescription(void) const;
-	virtual String GetShortDescription(void) const;
-	virtual int GetMaxArguments(void) const;
-	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const;
-	virtual ImpersonationLevel GetImpersonationLevel(void) const;
+	virtual String GetDescription(void) const override;
+	virtual String GetShortDescription(void) const override;
+	virtual int GetMaxArguments(void) const override;
+	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
+	virtual ImpersonationLevel GetImpersonationLevel(void) const override;
 };
 
 }

lib/cli/consolecommand.hpp

@@ -35,12 +35,12 @@ class ConsoleCommand : public CLICommand
 public:
 	DECLARE_PTR_TYPEDEFS(ConsoleCommand);
 
-	virtual String GetDescription(void) const;
-	virtual String GetShortDescription(void) const;
-	virtual ImpersonationLevel GetImpersonationLevel(void) const;
+	virtual String GetDescription(void) const override;
+	virtual String GetShortDescription(void) const override;
+	virtual ImpersonationLevel GetImpersonationLevel(void) const override;
 	virtual void InitParameters(boost::program_options::options_description& visibleDesc,
-	    boost::program_options::options_description& hiddenDesc) const;
-	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const;
+	    boost::program_options::options_description& hiddenDesc) const override;
+	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
 };
 
 }

lib/cli/daemoncommand.hpp

@@ -35,12 +35,12 @@ class DaemonCommand : public CLICommand
 public:
 	DECLARE_PTR_TYPEDEFS(DaemonCommand);
 
-	virtual String GetDescription(void) const;
-	virtual String GetShortDescription(void) const;
+	virtual String GetDescription(void) const override;
+	virtual String GetShortDescription(void) const override;
 	virtual void InitParameters(boost::program_options::options_description& visibleDesc,
-	    boost::program_options::options_description& hiddenDesc) const;
-	virtual std::vector<String> GetArgumentSuggestions(const String& argument, const String& word) const;
-	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const;
+	    boost::program_options::options_description& hiddenDesc) const override;
+	virtual std::vector<String> GetArgumentSuggestions(const String& argument, const String& word) const override;
+	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
 };
 
 }

lib/cli/featuredisablecommand.hpp

@@ -35,13 +35,13 @@ class FeatureDisableCommand : public CLICommand
 public:
 	DECLARE_PTR_TYPEDEFS(FeatureDisableCommand);
 
-	virtual String GetDescription(void) const;
-	virtual String GetShortDescription(void) const;
-	virtual int GetMinArguments(void) const;
-	virtual int GetMaxArguments(void) const;
-	virtual std::vector<String> GetPositionalSuggestions(const String& word) const;
-	virtual ImpersonationLevel GetImpersonationLevel(void) const;
-	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const;
+	virtual String GetDescription(void) const override;
+	virtual String GetShortDescription(void) const override;
+	virtual int GetMinArguments(void) const override;
+	virtual int GetMaxArguments(void) const override;
+	virtual std::vector<String> GetPositionalSuggestions(const String& word) const override;
+	virtual ImpersonationLevel GetImpersonationLevel(void) const override;
+	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
 
 };
 

lib/cli/featureenablecommand.hpp

@@ -35,13 +35,13 @@ class FeatureEnableCommand : public CLICommand
 public:
 	DECLARE_PTR_TYPEDEFS(FeatureEnableCommand);
 
-	virtual String GetDescription(void) const;
-	virtual String GetShortDescription(void) const;
-	virtual int GetMinArguments(void) const;
-	virtual int GetMaxArguments(void) const;
-	virtual std::vector<String> GetPositionalSuggestions(const String& word) const;
-	virtual ImpersonationLevel GetImpersonationLevel(void) const;
-	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const;
+	virtual String GetDescription(void) const override;
+	virtual String GetShortDescription(void) const override;
+	virtual int GetMinArguments(void) const override;
+	virtual int GetMaxArguments(void) const override;
+	virtual std::vector<String> GetPositionalSuggestions(const String& word) const override;
+	virtual ImpersonationLevel GetImpersonationLevel(void) const override;
+	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
 };
 
 }

lib/cli/featurelistcommand.hpp

@@ -35,9 +35,9 @@ class FeatureListCommand : public CLICommand
 public:
 	DECLARE_PTR_TYPEDEFS(FeatureListCommand);
 
-	virtual String GetDescription(void) const;
-	virtual String GetShortDescription(void) const;
-	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const;
+	virtual String GetDescription(void) const override;
+	virtual String GetShortDescription(void) const override;
+	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
 };
 
 }

lib/cli/nodeaddcommand.hpp

@@ -35,10 +35,10 @@ class NodeAddCommand : public CLICommand
 public:
 	DECLARE_PTR_TYPEDEFS(NodeAddCommand);
 
-	virtual String GetDescription(void) const;
-	virtual String GetShortDescription(void) const;
-	virtual int GetMinArguments(void) const;
-	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const;
+	virtual String GetDescription(void) const override;
+	virtual String GetShortDescription(void) const override;
+	virtual int GetMinArguments(void) const override;
+	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
 };
 
 }

lib/cli/nodeblackandwhitelistcommand.hpp

@@ -45,11 +45,11 @@ public:
 
 	BlackAndWhitelistCommand(const String& type, BlackAndWhitelistCommandType command);
 
-	virtual String GetDescription(void) const;
-	virtual String GetShortDescription(void) const;
+	virtual String GetDescription(void) const override;
+	virtual String GetShortDescription(void) const override;
 	virtual void InitParameters(boost::program_options::options_description& visibleDesc,
-	    boost::program_options::options_description& hiddenDesc) const;
-	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const;
+	    boost::program_options::options_description& hiddenDesc) const override;
+	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
 
 private:
 	String m_Type;

lib/cli/nodelistcommand.hpp

@@ -35,11 +35,11 @@ class NodeListCommand : public CLICommand
 public:
 	DECLARE_PTR_TYPEDEFS(NodeListCommand);
 
-	virtual String GetDescription(void) const;
-	virtual String GetShortDescription(void) const;
+	virtual String GetDescription(void) const override;
+	virtual String GetShortDescription(void) const override;
 	virtual void InitParameters(boost::program_options::options_description& visibleDesc,
-	    boost::program_options::options_description& hiddenDesc) const;
-	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const;
+	    boost::program_options::options_description& hiddenDesc) const override;
+	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
 };
 
 }

lib/cli/noderemovecommand.hpp

@@ -35,12 +35,12 @@ class NodeRemoveCommand : public CLICommand
 public:
 	DECLARE_PTR_TYPEDEFS(NodeRemoveCommand);
 
-	virtual String GetDescription(void) const;
-	virtual String GetShortDescription(void) const;
-	virtual int GetMinArguments(void) const;
-	virtual int GetMaxArguments(void) const;
-	virtual std::vector<String> GetPositionalSuggestions(const String& word) const;
-	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const;
+	virtual String GetDescription(void) const override;
+	virtual String GetShortDescription(void) const override;
+	virtual int GetMinArguments(void) const override;
+	virtual int GetMaxArguments(void) const override;
+	virtual std::vector<String> GetPositionalSuggestions(const String& word) const override;
+	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
 };
 
 }

lib/cli/nodesetcommand.hpp

@@ -35,12 +35,12 @@ class NodeSetCommand : public CLICommand
 public:
 	DECLARE_PTR_TYPEDEFS(NodeSetCommand);
 
-	virtual String GetDescription(void) const;
-	virtual String GetShortDescription(void) const;
-	virtual int GetMinArguments(void) const;
+	virtual String GetDescription(void) const override;
+	virtual String GetShortDescription(void) const override;
+	virtual int GetMinArguments(void) const override;
 	virtual void InitParameters(boost::program_options::options_description& visibleDesc,
-	    boost::program_options::options_description& hiddenDesc) const;
-	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const;
+	    boost::program_options::options_description& hiddenDesc) const override;
+	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
 };
 
 }

lib/cli/nodesetupcommand.hpp

@@ -35,13 +35,13 @@ class NodeSetupCommand : public CLICommand
 public:
 	DECLARE_PTR_TYPEDEFS(NodeSetupCommand);
 
-	virtual String GetDescription(void) const;
-	virtual String GetShortDescription(void) const;
+	virtual String GetDescription(void) const override;
+	virtual String GetShortDescription(void) const override;
 	virtual void InitParameters(boost::program_options::options_description& visibleDesc,
-	    boost::program_options::options_description& hiddenDesc) const;
-	virtual std::vector<String> GetArgumentSuggestions(const String& argument, const String& word) const;
-	virtual ImpersonationLevel GetImpersonationLevel(void) const;
-	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const;
+	    boost::program_options::options_description& hiddenDesc) const override;
+	virtual std::vector<String> GetArgumentSuggestions(const String& argument, const String& word) const override;
+	virtual ImpersonationLevel GetImpersonationLevel(void) const override;
+	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
 
 private:
 	static int SetupMaster(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap);

lib/cli/nodeupdateconfigcommand.hpp

@@ -35,10 +35,10 @@ class NodeUpdateConfigCommand : public CLICommand
 public:
 	DECLARE_PTR_TYPEDEFS(NodeUpdateConfigCommand);
 
-	virtual String GetDescription(void) const;
-	virtual String GetShortDescription(void) const;
-	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const;
-	virtual ImpersonationLevel GetImpersonationLevel(void) const;
+	virtual String GetDescription(void) const override;
+	virtual String GetShortDescription(void) const override;
+	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
+	virtual ImpersonationLevel GetImpersonationLevel(void) const override;
 };
 
 }

lib/cli/nodewizardcommand.hpp

@@ -35,11 +35,11 @@ class NodeWizardCommand : public CLICommand
 public:
 	DECLARE_PTR_TYPEDEFS(NodeWizardCommand);
 
-	virtual String GetDescription(void) const;
-	virtual String GetShortDescription(void) const;
-	virtual int GetMaxArguments(void) const;
-	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const;
-	virtual ImpersonationLevel GetImpersonationLevel(void) const;
+	virtual String GetDescription(void) const override;
+	virtual String GetShortDescription(void) const override;
+	virtual int GetMaxArguments(void) const override;
+	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
+	virtual ImpersonationLevel GetImpersonationLevel(void) const override;
 };
 
 }

lib/cli/objectlistcommand.hpp

@@ -38,11 +38,11 @@ class ObjectListCommand : public CLICommand
 public:
 	DECLARE_PTR_TYPEDEFS(ObjectListCommand);
 
-	virtual String GetDescription(void) const;
-	virtual String GetShortDescription(void) const;
+	virtual String GetDescription(void) const override;
+	virtual String GetShortDescription(void) const override;
 	virtual void InitParameters(boost::program_options::options_description& visibleDesc,
-	    boost::program_options::options_description& hiddenDesc) const;
-	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const;
+	    boost::program_options::options_description& hiddenDesc) const override;
+	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
 
 private:
 	static void PrintTypeCounts(std::ostream& fp, const std::map<String, int>& type_count);

lib/cli/pkinewcacommand.hpp

@@ -35,9 +35,9 @@ class PKINewCACommand : public CLICommand
 public:
 	DECLARE_PTR_TYPEDEFS(PKINewCACommand);
 
-	virtual String GetDescription(void) const;
-	virtual String GetShortDescription(void) const;
-	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const;
+	virtual String GetDescription(void) const override;
+	virtual String GetShortDescription(void) const override;
+	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
 
 };
 

lib/cli/pkinewcertcommand.hpp

@@ -35,12 +35,12 @@ class PKINewCertCommand : public CLICommand
 public:
 	DECLARE_PTR_TYPEDEFS(PKINewCertCommand);
 
-	virtual String GetDescription(void) const;
-	virtual String GetShortDescription(void) const;
+	virtual String GetDescription(void) const override;
+	virtual String GetShortDescription(void) const override;
 	virtual void InitParameters(boost::program_options::options_description& visibleDesc,
-	    boost::program_options::options_description& hiddenDesc) const;
-	virtual std::vector<String> GetArgumentSuggestions(const String& argument, const String& word) const;
-	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const;
+	    boost::program_options::options_description& hiddenDesc) const override;
+	virtual std::vector<String> GetArgumentSuggestions(const String& argument, const String& word) const override;
+	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
 
 };
 

lib/cli/pkirequestcommand.hpp

@@ -35,12 +35,12 @@ class PKIRequestCommand : public CLICommand
 public:
 	DECLARE_PTR_TYPEDEFS(PKIRequestCommand);
 
-	virtual String GetDescription(void) const;
-	virtual String GetShortDescription(void) const;
+	virtual String GetDescription(void) const override;
+	virtual String GetShortDescription(void) const override;
 	virtual void InitParameters(boost::program_options::options_description& visibleDesc,
-	    boost::program_options::options_description& hiddenDesc) const;
-	virtual std::vector<String> GetArgumentSuggestions(const String& argument, const String& word) const;
-	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const;
+	    boost::program_options::options_description& hiddenDesc) const override;
+	virtual std::vector<String> GetArgumentSuggestions(const String& argument, const String& word) const override;
+	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
 
 };
 

lib/cli/pkisavecertcommand.hpp

@@ -35,12 +35,12 @@ class PKISaveCertCommand : public CLICommand
 public:
 	DECLARE_PTR_TYPEDEFS(PKISaveCertCommand);
 
-	virtual String GetDescription(void) const;
-	virtual String GetShortDescription(void) const;
+	virtual String GetDescription(void) const override;
+	virtual String GetShortDescription(void) const override;
 	virtual void InitParameters(boost::program_options::options_description& visibleDesc,
-	    boost::program_options::options_description& hiddenDesc) const;
-	virtual std::vector<String> GetArgumentSuggestions(const String& argument, const String& word) const;
-	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const;
+	    boost::program_options::options_description& hiddenDesc) const override;
+	virtual std::vector<String> GetArgumentSuggestions(const String& argument, const String& word) const override;
+	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
 
 };
 

lib/cli/pkisigncsrcommand.hpp

@@ -35,12 +35,12 @@ class PKISignCSRCommand : public CLICommand
 public:
 	DECLARE_PTR_TYPEDEFS(PKISignCSRCommand);
 
-	virtual String GetDescription(void) const;
-	virtual String GetShortDescription(void) const;
+	virtual String GetDescription(void) const override;
+	virtual String GetShortDescription(void) const override;
 	virtual void InitParameters(boost::program_options::options_description& visibleDesc,
-	    boost::program_options::options_description& hiddenDesc) const;
-	virtual std::vector<String> GetArgumentSuggestions(const String& argument, const String& word) const;
-	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const;
+	    boost::program_options::options_description& hiddenDesc) const override;
+	virtual std::vector<String> GetArgumentSuggestions(const String& argument, const String& word) const override;
+	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
 
 };
 

lib/cli/pkiticketcommand.hpp

@@ -35,11 +35,11 @@ class PKITicketCommand : public CLICommand
 public:
 	DECLARE_PTR_TYPEDEFS(PKITicketCommand);
 
-	virtual String GetDescription(void) const;
-	virtual String GetShortDescription(void) const;
+	virtual String GetDescription(void) const override;
+	virtual String GetShortDescription(void) const override;
 	virtual void InitParameters(boost::program_options::options_description& visibleDesc,
-	    boost::program_options::options_description& hiddenDesc) const;
-	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const;
+	    boost::program_options::options_description& hiddenDesc) const override;
+	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
 
 };
 

lib/cli/repositoryclearchangescommand.hpp

@@ -38,10 +38,10 @@ class RepositoryClearChangesCommand : public CLICommand
 public:
 	DECLARE_PTR_TYPEDEFS(RepositoryClearChangesCommand);
 
-	virtual String GetDescription(void) const;
-	virtual String GetShortDescription(void) const;
-	virtual ImpersonationLevel GetImpersonationLevel(void) const;
-	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const;
+	virtual String GetDescription(void) const override;
+	virtual String GetShortDescription(void) const override;
+	virtual ImpersonationLevel GetImpersonationLevel(void) const override;
+	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
 };
 
 }

lib/cli/repositorycommitcommand.hpp

@@ -38,12 +38,12 @@ class RepositoryCommitCommand : public CLICommand
 public:
 	DECLARE_PTR_TYPEDEFS(RepositoryCommitCommand);
 
-	virtual String GetDescription(void) const;
-	virtual String GetShortDescription(void) const;
+	virtual String GetDescription(void) const override;
+	virtual String GetShortDescription(void) const override;
 	virtual void InitParameters(boost::program_options::options_description& visibleDesc,
-	    boost::program_options::options_description& hiddenDesc) const;
-	virtual ImpersonationLevel GetImpersonationLevel(void) const;
-	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const;
+	    boost::program_options::options_description& hiddenDesc) const override;
+	virtual ImpersonationLevel GetImpersonationLevel(void) const override;
+	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
 };
 
 }

lib/cli/repositoryobjectcommand.hpp

@@ -46,14 +46,14 @@ public:
 
 	RepositoryObjectCommand(const String& type, RepositoryCommandType command);
 
-	virtual String GetDescription(void) const;
-	virtual String GetShortDescription(void) const;
-	virtual int GetMaxArguments(void) const;
+	virtual String GetDescription(void) const override;
+	virtual String GetShortDescription(void) const override;
+	virtual int GetMaxArguments(void) const override;
 	virtual void InitParameters(boost::program_options::options_description& visibleDesc,
-	    boost::program_options::options_description& hiddenDesc) const;
-	virtual ImpersonationLevel GetImpersonationLevel(void) const;
-	virtual std::vector<String> GetPositionalSuggestions(const String& word) const;
-	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const;
+	    boost::program_options::options_description& hiddenDesc) const override;
+	virtual ImpersonationLevel GetImpersonationLevel(void) const override;
+	virtual std::vector<String> GetPositionalSuggestions(const String& word) const override;
+	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
 
 private:
 	String m_Type;

lib/cli/troubleshootcommand.hpp

@@ -37,11 +37,11 @@ class TroubleshootCommand : public CLICommand
 public:
 	DECLARE_PTR_TYPEDEFS(TroubleshootCommand);
 
-	virtual String GetDescription(void) const;
-	virtual String GetShortDescription(void) const;
-	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const;
+	virtual String GetDescription(void) const override;
+	virtual String GetShortDescription(void) const override;
+	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
 	virtual void InitParameters(boost::program_options::options_description& visibleDesc,
-	    boost::program_options::options_description& hiddenDesc) const;
+	    boost::program_options::options_description& hiddenDesc) const override;
 
 private:
 	class InfoLog;

lib/cli/variablegetcommand.hpp

@@ -38,12 +38,12 @@ class VariableGetCommand : public CLICommand
 public:
 	DECLARE_PTR_TYPEDEFS(VariableGetCommand);
 
-	virtual String GetDescription(void) const;
-	virtual String GetShortDescription(void) const;
-	virtual int GetMinArguments(void) const;
+	virtual String GetDescription(void) const override;
+	virtual String GetShortDescription(void) const override;
+	virtual int GetMinArguments(void) const override;
 	void InitParameters(boost::program_options::options_description& visibleDesc,
-	    boost::program_options::options_description& hiddenDesc) const;
-	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const;
+	    boost::program_options::options_description& hiddenDesc) const override;
+	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
 };
 
 }

lib/cli/variablelistcommand.hpp

@@ -38,9 +38,9 @@ class VariableListCommand : public CLICommand
 public:
 	DECLARE_PTR_TYPEDEFS(VariableListCommand);
 
-	virtual String GetDescription(void) const;
-	virtual String GetShortDescription(void) const;
-	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const;
+	virtual String GetDescription(void) const override;
+	virtual String GetShortDescription(void) const override;
+	virtual int Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const override;
 
 private:
 	static void PrintVariable(std::ostream& fp, const String& message);

lib/config/expression.hpp

@@ -210,12 +210,12 @@ public:
 	{ }
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override
 	{
 		return m_Expression->DoEvaluate(frame, dhint);
 	}
 
-	virtual const DebugInfo& GetDebugInfo(void) const
+	virtual const DebugInfo& GetDebugInfo(void) const override
 	{
 		return m_Expression->GetDebugInfo();
 	}
@@ -232,12 +232,12 @@ public:
 	{ }
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override
 	{
 		return m_Future.get()->DoEvaluate(frame, dhint);
 	}
 
-	virtual const DebugInfo& GetDebugInfo(void) const
+	virtual const DebugInfo& GetDebugInfo(void) const override
 	{
 		return m_Future.get()->GetDebugInfo();
 	}
@@ -252,7 +252,7 @@ public:
 	LiteralExpression(const Value& value = Value());
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
 
 private:
 	Value m_Value;
@@ -271,7 +271,7 @@ public:
 	{ }
 
 protected:
-	virtual const DebugInfo& GetDebugInfo(void) const;
+	virtual const DebugInfo& GetDebugInfo(void) const override;
 
 	DebugInfo m_DebugInfo;
 };
@@ -324,8 +324,8 @@ public:
 	}
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
-	virtual bool GetReference(ScriptFrame& frame, bool init_dict, Value *parent, String *index, DebugHint **dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
+	virtual bool GetReference(ScriptFrame& frame, bool init_dict, Value *parent, String *index, DebugHint **dhint) const override;
 
 private:
 	String m_Variable;
@@ -341,7 +341,7 @@ public:
 	{ }
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
 };
 	
 class I2_CONFIG_API LogicalNegateExpression : public UnaryExpression
@@ -352,7 +352,7 @@ public:
 	{ }
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
 };
 
 class I2_CONFIG_API AddExpression : public BinaryExpression
@@ -363,7 +363,7 @@ public:
 	{ }
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
 };
 	
 class I2_CONFIG_API SubtractExpression : public BinaryExpression
@@ -374,7 +374,7 @@ public:
 	{ }
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
 };
 	
 class I2_CONFIG_API MultiplyExpression : public BinaryExpression
@@ -385,7 +385,7 @@ public:
 	{ }
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
 };
 	
 class I2_CONFIG_API DivideExpression : public BinaryExpression
@@ -396,7 +396,7 @@ public:
 	{ }
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
 };
 
 class I2_CONFIG_API ModuloExpression : public BinaryExpression
@@ -407,7 +407,7 @@ public:
 	{ }
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
 };
 
 class I2_CONFIG_API XorExpression : public BinaryExpression
@@ -418,7 +418,7 @@ public:
 	{ }
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
 };
 
 class I2_CONFIG_API BinaryAndExpression : public BinaryExpression
@@ -429,7 +429,7 @@ public:
 	{ }
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
 };
 	
 class I2_CONFIG_API BinaryOrExpression : public BinaryExpression
@@ -440,7 +440,7 @@ public:
 	{ }
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
 };
 	
 class I2_CONFIG_API ShiftLeftExpression : public BinaryExpression
@@ -451,7 +451,7 @@ public:
 	{ }
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
 };
 	
 class I2_CONFIG_API ShiftRightExpression : public BinaryExpression
@@ -462,7 +462,7 @@ public:
 	{ }
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
 };
 	
 class I2_CONFIG_API EqualExpression : public BinaryExpression
@@ -473,7 +473,7 @@ public:
 	{ }
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
 };
 	
 class I2_CONFIG_API NotEqualExpression : public BinaryExpression
@@ -484,7 +484,7 @@ public:
 	{ }
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
 };
 	
 class I2_CONFIG_API LessThanExpression : public BinaryExpression
@@ -495,7 +495,7 @@ public:
 	{ }
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
 };
 	
 class I2_CONFIG_API GreaterThanExpression : public BinaryExpression
@@ -506,7 +506,7 @@ public:
 	{ }
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
 };
 	
 class I2_CONFIG_API LessThanOrEqualExpression : public BinaryExpression
@@ -517,7 +517,7 @@ public:
 	{ }
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
 };
 	
 class I2_CONFIG_API GreaterThanOrEqualExpression : public BinaryExpression
@@ -528,7 +528,7 @@ public:
 	{ }
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
 };
 	
 class I2_CONFIG_API InExpression : public BinaryExpression
@@ -539,7 +539,7 @@ public:
 	{ }
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
 };
 	
 class I2_CONFIG_API NotInExpression : public BinaryExpression
@@ -550,7 +550,7 @@ public:
 	{ }
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
 };
 	
 class I2_CONFIG_API LogicalAndExpression : public BinaryExpression
@@ -561,7 +561,7 @@ public:
 	{ }
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
 };
 	
 class I2_CONFIG_API LogicalOrExpression : public BinaryExpression
@@ -572,7 +572,7 @@ public:
 	{ }
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
 };
 	
 class I2_CONFIG_API FunctionCallExpression : public DebuggableExpression
@@ -591,7 +591,7 @@ public:
 	}
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
 
 public:
 	Expression *m_FName;
@@ -612,7 +612,7 @@ public:
 	}
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
 
 private:
 	std::vector<Expression *> m_Expressions;
@@ -634,7 +634,7 @@ public:
 	void MakeInline(void);
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
 
 private:
 	std::vector<Expression *> m_Expressions;
@@ -651,7 +651,7 @@ public:
 	{ }
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
 
 private:
 	CombinedSetOp m_Op;
@@ -674,7 +674,7 @@ public:
 	}
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
 
 private:
 	Expression *m_Condition;
@@ -696,7 +696,7 @@ public:
 	}
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
 
 private:
 	Expression *m_Condition;
@@ -712,7 +712,7 @@ public:
 	{ }
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
 };
 
 class I2_CONFIG_API BreakExpression : public DebuggableExpression
@@ -723,7 +723,7 @@ public:
 	{ }
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
 };
 
 class I2_CONFIG_API ContinueExpression : public DebuggableExpression
@@ -734,7 +734,7 @@ public:
 	{ }
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
 };
 
 class I2_CONFIG_API GetScopeExpression : public Expression
@@ -745,7 +745,7 @@ public:
 	{ }
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
 
 private:
 	ScopeSpecifier m_ScopeSpec;
@@ -759,8 +759,8 @@ public:
 	{ }
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
-	virtual bool GetReference(ScriptFrame& frame, bool init_dict, Value *parent, String *index, DebugHint **dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
+	virtual bool GetReference(ScriptFrame& frame, bool init_dict, Value *parent, String *index, DebugHint **dhint) const override;
 
 	friend I2_CONFIG_API void BindToScope(Expression *& expr, ScopeSpecifier scopeSpec);
 };
@@ -780,7 +780,7 @@ public:
 	}
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
 
 private:
 	Expression *m_Name;
@@ -795,7 +795,7 @@ public:
 	{ }
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
 
 private:
 	std::vector<String> m_Args;
@@ -821,7 +821,7 @@ public:
 	}
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
 
 private:
 	String m_Type;
@@ -852,7 +852,7 @@ public:
 	}
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
 
 private:
 	bool m_Abstract;
@@ -879,7 +879,7 @@ public:
 	}
 
 protected:
-	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const;
+	virtual ExpressionResult DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const override;
 
 private:
 	String m_FKVar;

lib/db_ido/commanddbobject.hpp

@@ -38,11 +38,11 @@ public:
 
 	CommandDbObject(const DbType::Ptr& type, const String& name1, const String& name2);
 
-	virtual Dictionary::Ptr GetConfigFields(void) const;
-	virtual Dictionary::Ptr GetStatusFields(void) const;
+	virtual Dictionary::Ptr GetConfigFields(void) const override;
+	virtual Dictionary::Ptr GetStatusFields(void) const override;
 
 protected:
-	virtual void OnConfigUpdate(void);
+	virtual void OnConfigUpdate(void) override;
 };
 
 }

lib/db_ido/endpointdbobject.hpp

@@ -41,8 +41,8 @@ public:
 
 	static void StaticInitialize(void);
 
-	virtual Dictionary::Ptr GetConfigFields(void) const;
-	virtual Dictionary::Ptr GetStatusFields(void) const;
+	virtual Dictionary::Ptr GetConfigFields(void) const override;
+	virtual Dictionary::Ptr GetStatusFields(void) const override;
 
 private:
 	static void UpdateConnectedStatus(const Endpoint::Ptr& endpoint);

lib/db_ido/hostdbobject.hpp

@@ -38,12 +38,12 @@ public:
 
 	HostDbObject(const DbType::Ptr& type, const String& name1, const String& name2);
 
-	virtual Dictionary::Ptr GetConfigFields(void) const;
-	virtual Dictionary::Ptr GetStatusFields(void) const;
+	virtual Dictionary::Ptr GetConfigFields(void) const override;
+	virtual Dictionary::Ptr GetStatusFields(void) const override;
 
 private:
-	virtual void OnConfigUpdate(void);
-	virtual void OnStatusUpdate(void);
+	virtual void OnConfigUpdate(void) override;
+	virtual void OnStatusUpdate(void) override;
 };
 
 }

lib/db_ido/hostgroupdbobject.hpp

@@ -39,11 +39,11 @@ public:
 
 	HostGroupDbObject(const DbType::Ptr& type, const String& name1, const String& name2);
 
-	virtual Dictionary::Ptr GetConfigFields(void) const;
-	virtual Dictionary::Ptr GetStatusFields(void) const;
+	virtual Dictionary::Ptr GetConfigFields(void) const override;
+	virtual Dictionary::Ptr GetStatusFields(void) const override;
 
 protected:
-	virtual void OnConfigUpdate(void);
+	virtual void OnConfigUpdate(void) override;
 
 private:
 	static void MembersChangedHandler(const HostGroup::Ptr& hgfilter);

lib/db_ido/servicedbobject.hpp

@@ -41,14 +41,14 @@ public:
 
 	static void StaticInitialize(void);
 
-	virtual Dictionary::Ptr GetConfigFields(void) const;
-	virtual Dictionary::Ptr GetStatusFields(void) const;
+	virtual Dictionary::Ptr GetConfigFields(void) const override;
+	virtual Dictionary::Ptr GetStatusFields(void) const override;
 
 protected:
-	virtual bool IsStatusAttribute(const String& attribute) const;
+	virtual bool IsStatusAttribute(const String& attribute) const override;
 
-	virtual void OnConfigUpdate(void);
-	virtual void OnStatusUpdate(void);
+	virtual void OnConfigUpdate(void) override;
+	virtual void OnStatusUpdate(void) override;
 };
 
 }

lib/db_ido/servicegroupdbobject.hpp

@@ -39,11 +39,11 @@ public:
 
 	ServiceGroupDbObject(const DbType::Ptr& type, const String& name1, const String& name2);
 
-	virtual Dictionary::Ptr GetConfigFields(void) const;
-	virtual Dictionary::Ptr GetStatusFields(void) const;
+	virtual Dictionary::Ptr GetConfigFields(void) const override;
+	virtual Dictionary::Ptr GetStatusFields(void) const override;
 
 protected:
-	virtual void OnConfigUpdate(void);
+	virtual void OnConfigUpdate(void) override;
 };
 
 }

lib/db_ido/timeperioddbobject.hpp

@@ -38,9 +38,9 @@ public:
 
 	TimePeriodDbObject(const DbType::Ptr& type, const String& name1, const String& name2);
 
-	virtual Dictionary::Ptr GetConfigFields(void) const;
-	virtual Dictionary::Ptr GetStatusFields(void) const;
-	virtual void OnConfigUpdate(void);
+	virtual Dictionary::Ptr GetConfigFields(void) const override;
+	virtual Dictionary::Ptr GetStatusFields(void) const override;
+	virtual void OnConfigUpdate(void) override;
 };
 
 }

lib/db_ido/userdbobject.hpp

@@ -38,12 +38,12 @@ public:
 
 	UserDbObject(const DbType::Ptr& type, const String& name1, const String& name2);
 
-	virtual Dictionary::Ptr GetConfigFields(void) const;
-	virtual Dictionary::Ptr GetStatusFields(void) const;
+	virtual Dictionary::Ptr GetConfigFields(void) const override;
+	virtual Dictionary::Ptr GetStatusFields(void) const override;
 
-	virtual void OnConfigUpdate(void);
+	virtual void OnConfigUpdate(void) override;
 
-	virtual bool IsStatusAttribute(const String& attribute) const;
+	virtual bool IsStatusAttribute(const String& attribute) const override;
 };
 
 }

lib/db_ido/usergroupdbobject.hpp

@@ -39,11 +39,11 @@ public:
 
 	UserGroupDbObject(const DbType::Ptr& type, const String& name1, const String& name2);
 
-	virtual Dictionary::Ptr GetConfigFields(void) const;
-	virtual Dictionary::Ptr GetStatusFields(void) const;
+	virtual Dictionary::Ptr GetConfigFields(void) const override;
+	virtual Dictionary::Ptr GetStatusFields(void) const override;
 
 protected:
-	virtual void OnConfigUpdate(void);
+	virtual void OnConfigUpdate(void) override;
 };
 
 }

lib/db_ido/zonedbobject.hpp

@@ -39,8 +39,8 @@ public:
 
 	ZoneDbObject(const intrusive_ptr<DbType>& type, const String& name1, const String& name2);
 
-	virtual Dictionary::Ptr GetConfigFields(void) const;
-	virtual Dictionary::Ptr GetStatusFields(void) const;
+	virtual Dictionary::Ptr GetConfigFields(void) const override;
+	virtual Dictionary::Ptr GetStatusFields(void) const override;
 };
 
 }

lib/livestatus/andfilter.hpp

@@ -37,7 +37,7 @@ public:
 
 	AndFilter(void);
 
-	virtual bool Apply(const Table::Ptr& table, const Value& row);
+	virtual bool Apply(const Table::Ptr& table, const Value& row) override;
 };
 
 }

lib/livestatus/attributefilter.hpp

@@ -37,7 +37,7 @@ public:
 
 	AttributeFilter(const String& column, const String& op, const String& operand);
 
-	virtual bool Apply(const Table::Ptr& table, const Value& row);
+	virtual bool Apply(const Table::Ptr& table, const Value& row) override;
 
 protected:
 	String m_Column;

lib/livestatus/avgaggregator.hpp

@@ -36,8 +36,8 @@ public:
 
 	AvgAggregator(const String& attr);
 
-	virtual void Apply(const Table::Ptr& table, const Value& row);
-	virtual double GetResult(void) const;
+	virtual void Apply(const Table::Ptr& table, const Value& row) override;
+	virtual double GetResult(void) const override;
 
 private:
 	double m_Avg;

lib/livestatus/commandstable.hpp

@@ -40,11 +40,11 @@ public:
 	static void AddColumns(Table *table, const String& prefix = String(),
 	    const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor());
 
-	virtual String GetName(void) const;
-	virtual String GetPrefix(void) const;
+	virtual String GetName(void) const override;
+	virtual String GetPrefix(void) const override;
 
 protected:
-	virtual void FetchRows(const AddRowFunction& addRowFn);
+	virtual void FetchRows(const AddRowFunction& addRowFn) override;
 
 	static Value NameAccessor(const Value& row);
 	static Value LineAccessor(const Value& row);

lib/livestatus/commentstable.hpp

@@ -40,11 +40,11 @@ public:
 	static void AddColumns(Table *table, const String& prefix = String(),
 	    const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor());
 
-	virtual String GetName(void) const;
-	virtual String GetPrefix(void) const;
+	virtual String GetName(void) const override;
+	virtual String GetPrefix(void) const override;
 
 protected:
-	virtual void FetchRows(const AddRowFunction& addRowFn);
+	virtual void FetchRows(const AddRowFunction& addRowFn) override;
 
 private:
 	static Object::Ptr HostAccessor(const Value& row, const Column::ObjectAccessor& parentObjectAccessor);

lib/livestatus/contactgroupstable.hpp

@@ -40,11 +40,11 @@ public:
 	static void AddColumns(Table *table, const String& prefix = String(),
 	    const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor());
 
-	virtual String GetName(void) const;
-	virtual String GetPrefix(void) const;
+	virtual String GetName(void) const override;
+	virtual String GetPrefix(void) const override;
 
 protected:
-	virtual void FetchRows(const AddRowFunction& addRowFn);
+	virtual void FetchRows(const AddRowFunction& addRowFn) override;
 
 	static Value NameAccessor(const Value& row);
 	static Value AliasAccessor(const Value& row);

lib/livestatus/contactstable.hpp

@@ -40,11 +40,11 @@ public:
 	static void AddColumns(Table *table, const String& prefix = String(),
 	    const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor());
 
-	virtual String GetName(void) const;
-	virtual String GetPrefix(void) const;
+	virtual String GetName(void) const override;
+	virtual String GetPrefix(void) const override;
 
 protected:
-	virtual void FetchRows(const AddRowFunction& addRowFn);
+	virtual void FetchRows(const AddRowFunction& addRowFn) override;
 
 	static Value NameAccessor(const Value& row);
 	static Value AliasAccessor(const Value& row);

lib/livestatus/countaggregator.hpp

@@ -36,8 +36,8 @@ public:
 
 	CountAggregator(void);
 
-	virtual void Apply(const Table::Ptr& table, const Value& row);
-	virtual double GetResult(void) const;
+	virtual void Apply(const Table::Ptr& table, const Value& row) override;
+	virtual double GetResult(void) const override;
 	
 private:
 	int m_Count;

lib/livestatus/downtimestable.hpp

@@ -40,11 +40,11 @@ public:
 	static void AddColumns(Table *table, const String& prefix = String(),
 	    const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor());
 
-	virtual String GetName(void) const;
-	virtual String GetPrefix(void) const;
+	virtual String GetName(void) const override;
+	virtual String GetPrefix(void) const override;
 
 protected:
-	virtual void FetchRows(const AddRowFunction& addRowFn);
+	virtual void FetchRows(const AddRowFunction& addRowFn) override;
 
 private:
 	static Object::Ptr HostAccessor(const Value& row, const Column::ObjectAccessor& parentObjectAccessor);

lib/livestatus/endpointstable.hpp

@@ -40,11 +40,11 @@ public:
 	static void AddColumns(Table *table, const String& prefix = String(),
 	    const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor());
 
-	virtual String GetName(void) const;
-	virtual String GetPrefix(void) const;
+	virtual String GetName(void) const override;
+	virtual String GetPrefix(void) const override;
 
 protected:
-	virtual void FetchRows(const AddRowFunction& addRowFn);
+	virtual void FetchRows(const AddRowFunction& addRowFn) override;
 
 	static Value NameAccessor(const Value& row);
 	static Value IdentityAccessor(const Value& row);

lib/livestatus/hostgroupstable.hpp

@@ -40,11 +40,11 @@ public:
 	static void AddColumns(Table *table, const String& prefix = String(),
 	    const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor());
 
-	virtual String GetName(void) const;
-	virtual String GetPrefix(void) const;
+	virtual String GetName(void) const override;
+	virtual String GetPrefix(void) const override;
 
 protected:
-	virtual void FetchRows(const AddRowFunction& addRowFn);
+	virtual void FetchRows(const AddRowFunction& addRowFn) override;
 
 	static Value NameAccessor(const Value& row);
 	static Value AliasAccessor(const Value& row);

lib/livestatus/hoststable.hpp

@@ -40,11 +40,11 @@ public:
 	static void AddColumns(Table *table, const String& prefix = String(),
 	    const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor());
 
-	virtual String GetName(void) const;
-	virtual String GetPrefix(void) const;
+	virtual String GetName(void) const override;
+	virtual String GetPrefix(void) const override;
 
 protected:
-	virtual void FetchRows(const AddRowFunction& addRowFn);
+	virtual void FetchRows(const AddRowFunction& addRowFn) override;
 
 	static Object::Ptr HostGroupAccessor(const Value& row, LivestatusGroupByType groupByType, const Object::Ptr& groupByObject);
 

lib/livestatus/invavgaggregator.hpp

@@ -36,8 +36,8 @@ public:
 
 	InvAvgAggregator(const String& attr);
 
-	virtual void Apply(const Table::Ptr& table, const Value& row);
-	virtual double GetResult(void) const;
+	virtual void Apply(const Table::Ptr& table, const Value& row) override;
+	virtual double GetResult(void) const override;
 
 private:
 	double m_InvAvg;

lib/livestatus/invsumaggregator.hpp

@@ -36,8 +36,8 @@ public:
 
 	InvSumAggregator(const String& attr);
 
-	virtual void Apply(const Table::Ptr& table, const Value& row);
-	virtual double GetResult(void) const;
+	virtual void Apply(const Table::Ptr& table, const Value& row) override;
+	virtual double GetResult(void) const override;
 
 private:
 	double m_InvSum;

lib/livestatus/logtable.hpp

@@ -41,13 +41,13 @@ public:
 	static void AddColumns(Table *table, const String& prefix = String(),
 	    const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor());
 
-	virtual String GetName(void) const;
-	virtual String GetPrefix(void) const;
+	virtual String GetName(void) const override;
+	virtual String GetPrefix(void) const override;
 
-	void UpdateLogEntries(const Dictionary::Ptr& log_entry_attrs, int line_count, int lineno, const AddRowFunction& addRowFn);
+	void UpdateLogEntries(const Dictionary::Ptr& log_entry_attrs, int line_count, int lineno, const AddRowFunction& addRowFn) override;
 
 protected:
-	virtual void FetchRows(const AddRowFunction& addRowFn);
+	virtual void FetchRows(const AddRowFunction& addRowFn) override;
 
 	static Object::Ptr HostAccessor(const Value& row, const Column::ObjectAccessor& parentObjectAccessor);
 	static Object::Ptr ServiceAccessor(const Value& row, const Column::ObjectAccessor& parentObjectAccessor);

lib/livestatus/maxaggregator.hpp

@@ -36,8 +36,8 @@ public:
 
 	MaxAggregator(const String& attr);
 
-	virtual void Apply(const Table::Ptr& table, const Value& row);
-	virtual double GetResult(void) const;
+	virtual void Apply(const Table::Ptr& table, const Value& row) override;
+	virtual double GetResult(void) const override;
 
 private:
 	double m_Max;

lib/livestatus/minaggregator.hpp

@@ -36,8 +36,8 @@ public:
 
 	MinAggregator(const String& attr);
 
-	virtual void Apply(const Table::Ptr& table, const Value& row);
-	virtual double GetResult(void) const;
+	virtual void Apply(const Table::Ptr& table, const Value& row) override;
+	virtual double GetResult(void) const override;
 
 private:
 	double m_Min;

lib/livestatus/negatefilter.hpp

@@ -37,7 +37,7 @@ public:
 
 	NegateFilter(const Filter::Ptr& inner);
 
-	virtual bool Apply(const Table::Ptr& table, const Value& row);
+	virtual bool Apply(const Table::Ptr& table, const Value& row) override;
 
 private:
 	Filter::Ptr m_Inner;

lib/livestatus/orfilter.hpp

@@ -37,7 +37,7 @@ public:
 
 	OrFilter(void);
 
-	virtual bool Apply(const Table::Ptr& table, const Value& row);
+	virtual bool Apply(const Table::Ptr& table, const Value& row) override;
 };
 
 }

lib/livestatus/servicegroupstable.hpp

@@ -40,11 +40,11 @@ public:
 	static void AddColumns(Table *table, const String& prefix = String(),
 	    const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor());
 
-	virtual String GetName(void) const;
-	virtual String GetPrefix(void) const;
+	virtual String GetName(void) const override;
+	virtual String GetPrefix(void) const override;
 
 protected:
-	virtual void FetchRows(const AddRowFunction& addRowFn);
+	virtual void FetchRows(const AddRowFunction& addRowFn) override;
 
 	static Value NameAccessor(const Value& row);
 	static Value AliasAccessor(const Value& row);

lib/livestatus/servicestable.hpp

@@ -40,11 +40,11 @@ public:
 	static void AddColumns(Table *table, const String& prefix = String(),
 	    const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor());
 
-	virtual String GetName(void) const;
-	virtual String GetPrefix(void) const;
+	virtual String GetName(void) const override;
+	virtual String GetPrefix(void) const override;
 
 protected:
-	virtual void FetchRows(const AddRowFunction& addRowFn);
+	virtual void FetchRows(const AddRowFunction& addRowFn) override;
 
 	static Object::Ptr HostAccessor(const Value& row, const Column::ObjectAccessor& parentObjectAccessor);
 	static Object::Ptr ServiceGroupAccessor(const Value& row, LivestatusGroupByType groupByType, const Object::Ptr& groupByObject);

lib/livestatus/statehisttable.hpp

@@ -42,13 +42,13 @@ public:
 	static void AddColumns(Table *table, const String& prefix = String(),
 	    const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor());
 
-	virtual String GetName(void) const;
-	virtual String GetPrefix(void) const;
+	virtual String GetName(void) const override;
+	virtual String GetPrefix(void) const override;
 
-	void UpdateLogEntries(const Dictionary::Ptr& log_entry_attrs, int line_count, int lineno, const AddRowFunction& addRowFn);
+	void UpdateLogEntries(const Dictionary::Ptr& log_entry_attrs, int line_count, int lineno, const AddRowFunction& addRowFn) override;
 
 protected:
-	virtual void FetchRows(const AddRowFunction& addRowFn);
+	virtual void FetchRows(const AddRowFunction& addRowFn) override;
 
 	static Object::Ptr HostAccessor(const Value& row, const Column::ObjectAccessor& parentObjectAccessor);
 	static Object::Ptr ServiceAccessor(const Value& row, const Column::ObjectAccessor& parentObjectAccessor);

lib/livestatus/statustable.hpp

@@ -40,11 +40,11 @@ public:
 	static void AddColumns(Table *table, const String& prefix = String(),
 	    const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor());
 
-	virtual String GetName(void) const;
-	virtual String GetPrefix(void) const;
+	virtual String GetName(void) const override;
+	virtual String GetPrefix(void) const override;
 
 protected:
-	virtual void FetchRows(const AddRowFunction& addRowFn);
+	virtual void FetchRows(const AddRowFunction& addRowFn) override;
 
 	static Value ConnectionsAccessor(const Value& row);
 	static Value ConnectionsRateAccessor(const Value& row);

lib/livestatus/stdaggregator.hpp

@@ -36,8 +36,8 @@ public:
 
 	StdAggregator(const String& attr);
 
-	virtual void Apply(const Table::Ptr& table, const Value& row);
-	virtual double GetResult(void) const;
+	virtual void Apply(const Table::Ptr& table, const Value& row) override;
+	virtual double GetResult(void) const override;
 
 private:
 	double m_StdSum;

lib/livestatus/sumaggregator.hpp

@@ -36,8 +36,8 @@ public:
 
 	SumAggregator(const String& attr);
 
-	virtual void Apply(const Table::Ptr& table, const Value& row);
-	virtual double GetResult(void) const;
+	virtual void Apply(const Table::Ptr& table, const Value& row) override;
+	virtual double GetResult(void) const override;
 
 private:
 	double m_Sum;

lib/livestatus/timeperiodstable.hpp

@@ -40,11 +40,11 @@ public:
 	static void AddColumns(Table *table, const String& prefix = String(),
 	    const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor());
 
-	virtual String GetName(void) const;
-	virtual String GetPrefix(void) const;
+	virtual String GetName(void) const override;
+	virtual String GetPrefix(void) const override;
 
 protected:
-	virtual void FetchRows(const AddRowFunction& addRowFn);
+	virtual void FetchRows(const AddRowFunction& addRowFn) override;
 
 	static Value NameAccessor(const Value& row);
 	static Value AliasAccessor(const Value& row);

lib/livestatus/zonestable.hpp

@@ -40,11 +40,11 @@ public:
 	static void AddColumns(Table *table, const String& prefix = String(),
 	    const Column::ObjectAccessor& objectAccessor = Column::ObjectAccessor());
 
-	virtual String GetName(void) const;
-	virtual String GetPrefix(void) const;
+	virtual String GetName(void) const override;
+	virtual String GetPrefix(void) const override;
 
 protected:
-	virtual void FetchRows(const AddRowFunction& addRowFn);
+	virtual void FetchRows(const AddRowFunction& addRowFn) override;
 
 	static Value NameAccessor(const Value& row);
 	static Value ParentAccessor(const Value& row);

lib/remote/actionshandler.hpp

@@ -30,7 +30,7 @@ class I2_REMOTE_API ActionsHandler : public HttpHandler
 public:
 	DECLARE_PTR_TYPEDEFS(ActionsHandler);
 
-	virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response);
+	virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) override;
 };
 
 }

lib/remote/configfileshandler.hpp

@@ -30,7 +30,7 @@ class I2_REMOTE_API ConfigFilesHandler : public HttpHandler
 public:
 	DECLARE_PTR_TYPEDEFS(ConfigFilesHandler);
 
-	virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response);
+	virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) override;
 
 private:
 	void HandleGet(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response);

lib/remote/configmoduleshandler.hpp

@@ -30,7 +30,7 @@ class I2_REMOTE_API ConfigModulesHandler : public HttpHandler
 public:
 	DECLARE_PTR_TYPEDEFS(ConfigModulesHandler);
 
-	virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response);
+	virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) override;
 
 private:
 	void HandleGet(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response);

lib/remote/configstageshandler.hpp

@@ -30,7 +30,7 @@ class I2_REMOTE_API ConfigStagesHandler : public HttpHandler
 public:
 	DECLARE_PTR_TYPEDEFS(ConfigStagesHandler);
 
-	virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response);
+	virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) override;
 
 private:
 	void HandleGet(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response);

lib/remote/createobjecthandler.hpp

@@ -30,7 +30,7 @@ class I2_REMOTE_API CreateObjectHandler : public HttpHandler
 public:
 	DECLARE_PTR_TYPEDEFS(CreateObjectHandler);
 
-	virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response);
+	virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) override;
 };
 
 }

lib/remote/deleteobjecthandler.hpp

@@ -30,7 +30,7 @@ class I2_REMOTE_API DeleteObjectHandler : public HttpHandler
 public:
 	DECLARE_PTR_TYPEDEFS(DeleteObjectHandler);
 
-	virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response);
+	virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) override;
 };
 
 }

lib/remote/modifyobjecthandler.hpp

@@ -30,7 +30,7 @@ class I2_REMOTE_API ModifyObjectHandler : public HttpHandler
 public:
 	DECLARE_PTR_TYPEDEFS(ModifyObjectHandler);
 
-	virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response);
+	virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) override;
 };
 
 }

lib/remote/statusqueryhandler.hpp

@@ -30,7 +30,7 @@ class I2_REMOTE_API StatusQueryHandler : public HttpHandler
 public:
 	DECLARE_PTR_TYPEDEFS(StatusQueryHandler);
 
-	virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response);
+	virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) override;
 };
 
 }