Fix compiler warnings

fixes #9929

lib/base/application.hpp

@@ -137,8 +137,8 @@ public:
 	static void DisplayInfoMessage(std::ostream& os, bool skipVersion = false);
 
 protected:
-	virtual void OnConfigLoaded(void);
-	virtual void Stop(void);
+	virtual void OnConfigLoaded(void) override;
+	virtual void Stop(void) override;
 
 	void RunEventLoop(void);
 

lib/base/array.hpp

@@ -110,7 +110,7 @@ public:
 		return result;
 	}
 	
-	virtual Object::Ptr Clone(void) const;
+	virtual Object::Ptr Clone(void) const override;
 
 private:
 	std::vector<Value> m_Data; /**< The data for the array. */

lib/base/dictionary.hpp

@@ -113,7 +113,7 @@ public:
 
 	static Object::Ptr GetPrototype(void);
 	
-	virtual Object::Ptr Clone(void) const;
+	virtual Object::Ptr Clone(void) const override;
 
 private:
 	std::map<String, Value> m_Data; /**< The data for the dictionary. */

lib/base/filelogger.hpp

@@ -39,7 +39,7 @@ public:
 
 	static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
 
-	virtual void Start(void);
+	virtual void Start(void) override;
 
 private:
 	void ReopenLogFile(void);

lib/base/logger.hpp

@@ -93,8 +93,8 @@ public:
 	static void StaticInitialize(void);
 
 protected:
-	virtual void Start(void);
-	virtual void Stop(void);
+	virtual void Start(void) override;
+	virtual void Stop(void) override;
 
 private:
 	static boost::mutex m_Mutex;

lib/base/object.cpp

@@ -106,3 +106,9 @@ Object::Ptr Object::Clone(void) const
 {
 	BOOST_THROW_EXCEPTION(std::runtime_error("Object cannot be cloned."));
 }
+
+Type::Ptr Object::GetReflectionType(void) const
+{
+	return Object::TypeInstance;
+}
+

lib/base/object.hpp

@@ -55,11 +55,13 @@ extern I2_BASE_API Value Empty;
 #define DECLARE_PTR_TYPEDEFS(klass) \
 	typedef intrusive_ptr<klass> Ptr
 
-#define IMPL_TYPE_LOOKUP() 						\
-	static intrusive_ptr<Type> TypeInstance;			\
-	virtual intrusive_ptr<Type> GetReflectionType(void) const	\
-	{								\
-		return TypeInstance;					\
+#define IMPL_TYPE_LOOKUP_SUPER() 					\
+
+#define IMPL_TYPE_LOOKUP() 							\
+	static intrusive_ptr<Type> TypeInstance;				\
+	virtual intrusive_ptr<Type> GetReflectionType(void) const override	\
+	{									\
+		return TypeInstance;						\
 	}
 
 #define DECLARE_OBJECT(klass) \
@@ -92,13 +94,15 @@ struct TypeHelper
 class I2_BASE_API Object
 {
 public:
-	DECLARE_OBJECT(Object);
+	DECLARE_PTR_TYPEDEFS(Object);
 
 	Object(void);
 	virtual ~Object(void);
 
 	virtual String ToString(void) const;
 
+	virtual intrusive_ptr<Type> GetReflectionType(void) const;
+
 	virtual void SetField(int id, const Value& value, bool suppress_events = false, const Value& cookie = Empty);
 	virtual Value GetField(int id) const;
 	virtual void ValidateField(int id, const Value& value, const ValidationUtils& utils);
@@ -114,6 +118,8 @@ public:
 	
 	virtual Object::Ptr Clone(void) const;
 
+	static intrusive_ptr<Type> TypeInstance;
+
 private:
 	Object(const Object& other);
 	Object& operator=(const Object& rhs);

lib/base/streamlogger.hpp

@@ -40,7 +40,7 @@ public:
 
 	StreamLogger(void);
 
-	virtual void Stop(void);
+	virtual void Stop(void) override;
 	~StreamLogger(void);
 
 	void BindStream(std::ostream *stream, bool ownsStream);
@@ -48,8 +48,8 @@ public:
 	static void ProcessLogEntry(std::ostream& stream, const LogEntry& entry);
 
 protected:
-	virtual void ProcessLogEntry(const LogEntry& entry);
-	virtual void Flush(void);
+	virtual void ProcessLogEntry(const LogEntry& entry) override;
+	virtual void Flush(void) override;
 
 private:
 	static boost::mutex m_Mutex;

lib/base/sysloglogger.hpp

@@ -41,8 +41,8 @@ public:
 	static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
 
 protected:
-	virtual void ProcessLogEntry(const LogEntry& entry);
-	virtual void Flush(void);
+	virtual void ProcessLogEntry(const LogEntry& entry) override;
+	virtual void Flush(void) override;
 };
 
 }

lib/base/type.hpp

@@ -71,7 +71,7 @@ class I2_BASE_API Type : public Object
 public:
 	DECLARE_OBJECT(Type);
 
-	virtual String ToString(void) const;
+	virtual String ToString(void) const override;
 
 	virtual String GetName(void) const = 0;
 	virtual Type::Ptr GetBaseType(void) const = 0;
@@ -94,8 +94,8 @@ public:
 	static void Register(const Type::Ptr& type);
 	static Type::Ptr GetByName(const String& name);
 
-	virtual void SetField(int id, const Value& value, bool suppress_events = false, const Value& cookie = Empty);
-	virtual Value GetField(int id) const;
+	virtual void SetField(int id, const Value& value, bool suppress_events = false, const Value& cookie = Empty) override;
+	virtual Value GetField(int id) const override;
 
 	virtual std::vector<String> GetLoadDependencies(void) const;
 	

lib/checker/checkercomponent.hpp

@@ -70,9 +70,9 @@ public:
 
 	CheckerComponent(void);
 
-	virtual void OnConfigLoaded(void);
-	virtual void Start(void);
-	virtual void Stop(void);
+	virtual void OnConfigLoaded(void) override;
+	virtual void Start(void) override;
+	virtual void Stop(void) override;
 
 	static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
 	unsigned long GetIdleCheckables(void);

lib/compat/checkresultreader.hpp

@@ -41,7 +41,7 @@ public:
 	static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
 
 protected:
-	virtual void Start(void);
+	virtual void Start(void) override;
 
 private:
 	Timer::Ptr m_ReadTimer;

lib/compat/compatlogger.hpp

@@ -44,7 +44,7 @@ public:
 	virtual void ValidateRotationMethod(const String& value, const ValidationUtils& utils) override;
 
 protected:
-	virtual void Start(void);
+	virtual void Start(void) override;
 
 private:
 	void WriteLine(const String& line);

lib/compat/externalcommandlistener.hpp

@@ -42,7 +42,7 @@ public:
 	static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
 
 protected:
-	virtual void Start(void);
+	virtual void Start(void) override;
 
 private:
 #ifndef _WIN32

lib/compat/statusdatawriter.hpp

@@ -47,7 +47,7 @@ public:
 	static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
 
 protected:
-	virtual void Start(void);
+	virtual void Start(void) override;
 
 private:
 	Timer::Ptr m_StatusTimer;

lib/db_ido/dbconnection.hpp

@@ -77,10 +77,10 @@ public:
 	virtual void ValidateFailoverTimeout(double value, const ValidationUtils& utils) override;
 
 protected:
-	virtual void OnConfigLoaded(void);
-	virtual void Start(void);
-	virtual void Resume(void);
-	virtual void Pause(void);
+	virtual void OnConfigLoaded(void) override;
+	virtual void Start(void) override;
+	virtual void Resume(void) override;
+	virtual void Pause(void) override;
 
 	virtual void ExecuteQuery(const DbQuery& query) = 0;
 	virtual void ActivateObject(const DbObject::Ptr& dbobj) = 0;

lib/db_ido_mysql/idomysqlconnection.hpp

@@ -54,18 +54,18 @@ public:
 
 	static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
 
-	virtual int GetPendingQueryCount(void) const;
+	virtual int GetPendingQueryCount(void) const override;
 
 protected:
-	virtual void Resume(void);
-	virtual void Pause(void);
+	virtual void Resume(void) override;
+	virtual void Pause(void) override;
 
-	virtual void ActivateObject(const DbObject::Ptr& dbobj);
-	virtual void DeactivateObject(const DbObject::Ptr& dbobj);
-	virtual void ExecuteQuery(const DbQuery& query);
-	virtual void CleanUpExecuteQuery(const String& table, const String& time_key, double time_value);
-	virtual void FillIDCache(const DbType::Ptr& type);
-	virtual void NewTransaction(void);
+	virtual void ActivateObject(const DbObject::Ptr& dbobj) override;
+	virtual void DeactivateObject(const DbObject::Ptr& dbobj) override;
+	virtual void ExecuteQuery(const DbQuery& query) override;
+	virtual void CleanUpExecuteQuery(const String& table, const String& time_key, double time_value) override;
+	virtual void FillIDCache(const DbType::Ptr& type) override;
+	virtual void NewTransaction(void) override;
 
 private:
 	DbReference m_InstanceID;
@@ -108,7 +108,7 @@ private:
 	void InternalCleanUpExecuteQuery(const String& table, const String& time_key, double time_value);
 	void InternalNewTransaction(void);
 
-	virtual void ClearConfigTable(const String& table);
+	virtual void ClearConfigTable(const String& table) override;
 
 	void ExceptionHandler(boost::exception_ptr exp);
 };

lib/db_ido_pgsql/idopgsqlconnection.hpp

@@ -46,18 +46,18 @@ public:
 
 	static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
 
-	virtual int GetPendingQueryCount(void) const;
+	virtual int GetPendingQueryCount(void) const override;
 
 protected:
-	virtual void Resume(void);
-	virtual void Pause(void);
+	virtual void Resume(void) override;
+	virtual void Pause(void) override;
 
-	virtual void ActivateObject(const DbObject::Ptr& dbobj);
-	virtual void DeactivateObject(const DbObject::Ptr& dbobj);
-	virtual void ExecuteQuery(const DbQuery& query);
-	virtual void CleanUpExecuteQuery(const String& table, const String& time_key, double time_value);
-	virtual void FillIDCache(const DbType::Ptr& type);
-	virtual void NewTransaction(void);
+	virtual void ActivateObject(const DbObject::Ptr& dbobj) override;
+	virtual void DeactivateObject(const DbObject::Ptr& dbobj) override;
+	virtual void ExecuteQuery(const DbQuery& query) override;
+	virtual void CleanUpExecuteQuery(const String& table, const String& time_key, double time_value) override;
+	virtual void FillIDCache(const DbType::Ptr& type) override;
+	virtual void NewTransaction(void) override;
 
 private:
 	DbReference m_InstanceID;
@@ -92,7 +92,7 @@ private:
 	void InternalExecuteQuery(const DbQuery& query, DbQueryType *typeOverride = NULL);
 	void InternalCleanUpExecuteQuery(const String& table, const String& time_key, double time_value);
 
-	virtual void ClearConfigTable(const String& table);
+	virtual void ClearConfigTable(const String& table) override;
 
 	void ExceptionHandler(boost::exception_ptr exp);
 };

lib/hello/hello.hpp

@@ -36,7 +36,7 @@ public:
 	DECLARE_OBJECT(Hello);
 	DECLARE_OBJECTNAME(Hello);
 
-	int Main(void);
+	virtual int Main(void) override;
 };
 
 }

lib/icinga/checkable.hpp

@@ -103,8 +103,8 @@ public:
 	void ExecuteCheck();
 	void ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrigin::Ptr& origin = MessageOrigin::Ptr());
 
-	int GetModifiedAttributes(void) const;
-	void SetModifiedAttributes(int flags, const MessageOrigin::Ptr& origin = MessageOrigin::Ptr());
+	virtual int GetModifiedAttributes(void) const override;
+	virtual void SetModifiedAttributes(int flags, const MessageOrigin::Ptr& origin = MessageOrigin::Ptr()) override;
 
 	Endpoint::Ptr GetCommandEndpoint(void) const;
 
@@ -209,9 +209,9 @@ public:
 	virtual void ValidateCheckInterval(double value, const ValidationUtils& utils) override;
 
 protected:
-	virtual void Start(void);
+	virtual void Start(void) override;
 
-	virtual void OnStateLoaded(void);
+	virtual void OnStateLoaded(void) override;
 
 private:
 	mutable boost::mutex m_CheckableMutex;

lib/icinga/command.hpp

@@ -41,8 +41,8 @@ public:
 
 	virtual void Validate(int types, const ValidationUtils& utils) override;
 
-	int GetModifiedAttributes(void) const;
-	void SetModifiedAttributes(int flags, const MessageOrigin::Ptr& origin = MessageOrigin::Ptr());
+	int GetModifiedAttributes(void) const override;
+	void SetModifiedAttributes(int flags, const MessageOrigin::Ptr& origin = MessageOrigin::Ptr()) override;
 };
 
 }

lib/icinga/dependency.hpp

@@ -57,9 +57,9 @@ public:
 	static void EvaluateApplyRules(const intrusive_ptr<Service>& service);
 
 protected:
-	virtual void OnConfigLoaded(void);
-	virtual void OnAllConfigLoaded(void);
-	virtual void Stop(void);
+	virtual void OnConfigLoaded(void) override;
+	virtual void OnAllConfigLoaded(void) override;
+	virtual void Stop(void) override;
 
 private:
 	Checkable::Ptr m_Parent;

lib/icinga/host.hpp

@@ -51,9 +51,9 @@ public:
 
 	static HostState CalculateState(ServiceState state);
 
-	virtual HostState GetState(void) const;
-	virtual HostState GetLastState(void) const;
-	virtual HostState GetLastHardState(void) const;
+	virtual HostState GetState(void) const override;
+	virtual HostState GetLastState(void) const override;
+	virtual HostState GetLastHardState(void) const override;
 	double GetLastStateUp(void) const;
 	double GetLastStateDown(void) const;
 
@@ -63,13 +63,13 @@ public:
 	static StateType StateTypeFromString(const String& state);
 	static String StateTypeToString(StateType state);
 
-	virtual bool ResolveMacro(const String& macro, const CheckResult::Ptr& cr, Value *result) const;
+	virtual bool ResolveMacro(const String& macro, const CheckResult::Ptr& cr, Value *result) const override;
 
 protected:
-	virtual void Stop(void);
+	virtual void Stop(void) override;
 
-	virtual void OnAllConfigLoaded(void);
-	virtual void CreateChildObjects(const Type::Ptr& childType);
+	virtual void OnAllConfigLoaded(void) override;
+	virtual void CreateChildObjects(const Type::Ptr& childType) override;
 
 private:
 	mutable boost::mutex m_ServicesMutex;

lib/icinga/icingaapplication.hpp

@@ -40,7 +40,7 @@ public:
 
 	static void StaticInitialize(void);
 
-	int Main(void);
+	virtual int Main(void) override;
 
 	static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
 
@@ -50,7 +50,7 @@ public:
 	Dictionary::Ptr GetVars(void) const;
 	String GetNodeName(void) const;
 
-	virtual bool ResolveMacro(const String& macro, const CheckResult::Ptr& cr, Value *result) const;
+	virtual bool ResolveMacro(const String& macro, const CheckResult::Ptr& cr, Value *result) const override;
 
 	bool GetEnableNotifications(void) const;
 	void SetEnableNotifications(bool enabled);
@@ -78,7 +78,7 @@ public:
 private:
 	void DumpProgramState(void);
 
-	virtual void OnShutdown(void);
+	virtual void OnShutdown(void) override;
 };
 
 }

lib/icinga/icingastatuswriter.hpp

@@ -39,7 +39,7 @@ public:
 	static Dictionary::Ptr GetStatusData(void);
 
 protected:
-	virtual void Start(void);
+	virtual void Start(void) override;
 
 private:
 	Timer::Ptr m_StatusTimer;

lib/icinga/notification.hpp

@@ -116,10 +116,10 @@ public:
 	static void EvaluateApplyRules(const intrusive_ptr<Service>& service);
 
 protected:
-	virtual void OnConfigLoaded(void);
-	virtual void OnAllConfigLoaded(void);
-	virtual void Start(void);
-	virtual void Stop(void);
+	virtual void OnConfigLoaded(void) override;
+	virtual void OnAllConfigLoaded(void) override;
+	virtual void Start(void) override;
+	virtual void Stop(void) override;
 
 private:
 	void ExecuteNotificationHelper(NotificationType type, const User::Ptr& user, const CheckResult::Ptr& cr, bool force, const String& author = "", const String& text = "");

lib/icinga/scheduleddowntime.hpp

@@ -56,8 +56,8 @@ public:
 	virtual void ValidateRanges(const Dictionary::Ptr& value, const ValidationUtils& utils) override;
 
 protected:
-	virtual void OnAllConfigLoaded(void);
-	virtual void Start(void);
+	virtual void OnAllConfigLoaded(void) override;
+	virtual void Start(void) override;
 
 private:
 	static void TimerProc(void);

lib/icinga/service.hpp

@@ -43,7 +43,7 @@ public:
 
 	Host::Ptr GetHost(void) const;
 
-	virtual bool ResolveMacro(const String& macro, const CheckResult::Ptr& cr, Value *result) const;
+	virtual bool ResolveMacro(const String& macro, const CheckResult::Ptr& cr, Value *result) const override;
 
 	static ServiceState StateFromString(const String& state);
 	static String StateToString(ServiceState state);
@@ -56,8 +56,8 @@ public:
 	static void EvaluateApplyRules(const Host::Ptr& host);
 
 protected:
-	virtual void OnAllConfigLoaded(void);
-	virtual void CreateChildObjects(const Type::Ptr& childType);
+	virtual void OnAllConfigLoaded(void) override;
+	virtual void CreateChildObjects(const Type::Ptr& childType) override;
 
 private:
 	Host::Ptr m_Host;

lib/icinga/timeperiod.hpp

@@ -39,11 +39,11 @@ public:
 
 	static void StaticInitialize(void);
 
-	virtual void Start(void);
+	virtual void Start(void) override;
 
 	void UpdateRegion(double begin, double end, bool clearExisting);
 
-	virtual bool GetIsInside(void) const;
+	virtual bool GetIsInside(void) const override;
 
 	bool IsInside(double ts) const;
 	double FindNextTransition(double begin);

lib/icinga/user.hpp

@@ -47,14 +47,14 @@ public:
 	virtual void ValidateStates(const Array::Ptr& value, const ValidationUtils& utils) override;
 	virtual void ValidateTypes(const Array::Ptr& value, const ValidationUtils& utils) override;
 
-	int GetModifiedAttributes(void) const;
-	void SetModifiedAttributes(int flags, const MessageOrigin::Ptr& origin = MessageOrigin::Ptr());
+	virtual int GetModifiedAttributes(void) const override;
+	virtual void SetModifiedAttributes(int flags, const MessageOrigin::Ptr& origin = MessageOrigin::Ptr()) override;
 
 protected:
-	virtual void Stop(void);
+	virtual void Stop(void) override;
 
-	virtual void OnConfigLoaded(void);
-	virtual void OnAllConfigLoaded(void);
+	virtual void OnConfigLoaded(void) override;
+	virtual void OnAllConfigLoaded(void) override;
 private:
 	mutable boost::mutex m_UserMutex;
 };

lib/livestatus/livestatuslistener.hpp

@@ -48,8 +48,8 @@ public:
 	virtual void ValidateSocketType(const String& value, const ValidationUtils& utils) override;
 
 protected:
-	virtual void Start(void);
-	virtual void Stop(void);
+	virtual void Start(void) override;
+	virtual void Stop(void) override;
 
 private:
 	void ServerThreadProc(void);

lib/notification/notificationcomponent.hpp

@@ -39,7 +39,7 @@ public:
 
 	static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
 
-	virtual void Start(void);
+	virtual void Start(void) override;
 
 private:
 	Timer::Ptr m_NotificationTimer;

lib/perfdata/gelfwriter.hpp

@@ -42,7 +42,7 @@ public:
 	DECLARE_OBJECTNAME(GelfWriter);
 
 protected:
-	virtual void Start(void);
+	virtual void Start(void) override;
 
 private:
 	Stream::Ptr m_Stream;

lib/perfdata/graphitewriter.hpp

@@ -47,7 +47,7 @@ public:
 	virtual void ValidateServiceNameTemplate(const String& value, const ValidationUtils& utils) override;
 
 protected:
-	virtual void Start(void);
+	virtual void Start(void) override;
 
 private:
 	Stream::Ptr m_Stream;

lib/perfdata/opentsdbwriter.hpp

@@ -44,7 +44,7 @@ public:
 	static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
 
 protected:
-	virtual void Start(void);
+	virtual void Start(void) override;
 
 private:
 	Stream::Ptr m_Stream;

lib/perfdata/perfdatawriter.hpp

@@ -46,7 +46,7 @@ public:
 	virtual void ValidateServiceFormatTemplate(const String& value, const ValidationUtils& utils) override;
 
 protected:
-	virtual void Start(void);
+	virtual void Start(void) override;
 
 private:
 	void CheckResultHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr);

lib/remote/apilistener.hpp

@@ -77,9 +77,9 @@ public:
 
 	static Value HelloAPIHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params);
 protected:
-	virtual void OnConfigLoaded(void);
-	virtual void OnAllConfigLoaded(void);
-	virtual void Start(void);
+	virtual void OnConfigLoaded(void) override;
+	virtual void OnAllConfigLoaded(void) override;
+	virtual void Start(void) override;
 
 private:
 	boost::shared_ptr<SSL_CTX> m_SSLContext;

lib/remote/endpoint.hpp

@@ -55,7 +55,7 @@ public:
 	static Endpoint::Ptr GetLocalEndpoint(void);
 
 protected:
-	virtual void OnAllConfigLoaded(void);
+	virtual void OnAllConfigLoaded(void) override;
 
 private:
 	mutable boost::mutex m_ClientsLock;