Fix compiler warnings

fixes #9929

diff --git a/lib/base/application.hpp b/lib/base/application.hpp
index 47b1c291562cb76a8410d15d3aeb3ca6c99c4c9b..fe6472dbc44655fd881051ad93c7d4d95489e8b2 100644 (file)
--- a/lib/base/application.hpp
+++ b/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);
 

diff --git a/lib/base/array.hpp b/lib/base/array.hpp
index 88eb3fdde28462c6dc42cb6ed376d80d061a3634..0838189552d7c78f8baff6413be7badb1d947c80 100644 (file)
--- a/lib/base/array.hpp
+++ b/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. */

diff --git a/lib/base/dictionary.hpp b/lib/base/dictionary.hpp
index 152956ac11bbddb3a8ee80fbe305fdbe57aa0583..0556aa31f95ab9b3ff9b3515fea4dc9a4d6625fe 100644 (file)
--- a/lib/base/dictionary.hpp
+++ b/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. */

diff --git a/lib/base/filelogger.hpp b/lib/base/filelogger.hpp
index cf2d342ecce52a5adc1add990aa28968181f6d9a..026e101b221b738a2166dc72014ed0c0ed0a3279 100644 (file)
--- a/lib/base/filelogger.hpp
+++ b/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);

diff --git a/lib/base/logger.hpp b/lib/base/logger.hpp
index 2d10a133477102c84d9f07f360a021f1b9b9bae7..7877e1961779d78b319f366bd24acea929d40e02 100644 (file)
--- a/lib/base/logger.hpp
+++ b/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;

diff --git a/lib/base/object.cpp b/lib/base/object.cpp
index 062cb9c77fbbe9e7f06c6ed3971b4e1bb927b80e..ed7cd9efc2837c470d0f4b0825844144e8e0e8bf 100644 (file)
--- a/lib/base/object.cpp
+++ b/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;
+}
+

diff --git a/lib/base/object.hpp b/lib/base/object.hpp
index 7d4f2a35862b7fd72f5c927867be72ef69696d6c..e6b0875d005b8dbe4c2ab4865fe38093dfba854e 100644 (file)
--- a/lib/base/object.hpp
+++ b/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);

diff --git a/lib/base/streamlogger.hpp b/lib/base/streamlogger.hpp
index 9ab84127a21e700b5bf3ac369966740442c7c468..68d70f9fba6022d3799f86675ebd1793826e2b35 100644 (file)
--- a/lib/base/streamlogger.hpp
+++ b/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;

diff --git a/lib/base/sysloglogger.hpp b/lib/base/sysloglogger.hpp
index 3be5dcaed9b0d100bb548eb4f2badf096a4a0b34..2ef3ceeb5805119b6be4fbccaf784770b99bd8b8 100644 (file)
--- a/lib/base/sysloglogger.hpp
+++ b/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;
 };
 
 }

diff --git a/lib/base/type.hpp b/lib/base/type.hpp
index 1017e4bb0f25648240673a5d7ef99ac369ce3590..c208ffa35d83b26e17e2b5c2c021249302a6d080 100644 (file)
--- a/lib/base/type.hpp
+++ b/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;
        

diff --git a/lib/checker/checkercomponent.hpp b/lib/checker/checkercomponent.hpp
index e20c9a944120c3bd185981786911e7658e9b749a..21389f8e73437d3a3154d0b82e55dc643f905a43 100644 (file)
--- a/lib/checker/checkercomponent.hpp
+++ b/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);

diff --git a/lib/compat/checkresultreader.hpp b/lib/compat/checkresultreader.hpp
index dd87afa9c4d518b58565e8e656acf10b2a49d485..15d6f52ef339642d7c781170fc40e3a4c8090be8 100644 (file)
--- a/lib/compat/checkresultreader.hpp
+++ b/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;

diff --git a/lib/compat/compatlogger.hpp b/lib/compat/compatlogger.hpp
index 4799f7d8d4f01eee472cf3a334f6ad3b411c451f..79d08acce06ddc23462e3935ffffca893bba3e2d 100644 (file)
--- a/lib/compat/compatlogger.hpp
+++ b/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);

diff --git a/lib/compat/externalcommandlistener.hpp b/lib/compat/externalcommandlistener.hpp
index 6e83eaf2388c9a7b812e0a63cefbce34139b5e7a..41fba96731ed2a66a24e97228a49eaddb95db989 100644 (file)
--- a/lib/compat/externalcommandlistener.hpp
+++ b/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

diff --git a/lib/compat/statusdatawriter.hpp b/lib/compat/statusdatawriter.hpp
index 1e6b919eec602b518c1b2192477a84a50f1c2c94..a3c743fcebb9d1a3455c288494d18a404b9bcdee 100644 (file)
--- a/lib/compat/statusdatawriter.hpp
+++ b/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;

diff --git a/lib/db_ido/dbconnection.hpp b/lib/db_ido/dbconnection.hpp
index ad71a016502cd5e7278740e2f1f22f594457f958..4b725fed21330fc1e57f688134e52cd3881564dc 100644 (file)
--- a/lib/db_ido/dbconnection.hpp
+++ b/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;

diff --git a/lib/db_ido_mysql/idomysqlconnection.hpp b/lib/db_ido_mysql/idomysqlconnection.hpp
index 41cae1fd467af2f1684cb7093677cf50941f3746..dd414186c5a70d62c0477883404525398f510e99 100644 (file)
--- a/lib/db_ido_mysql/idomysqlconnection.hpp
+++ b/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);
 };

diff --git a/lib/db_ido_pgsql/idopgsqlconnection.hpp b/lib/db_ido_pgsql/idopgsqlconnection.hpp
index be009b5b92345b78c2e299d57a8f08e7829f66df..f0998b18f04dfaf902bdd6ab70690311c391ac78 100644 (file)
--- a/lib/db_ido_pgsql/idopgsqlconnection.hpp
+++ b/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);
 };

diff --git a/lib/hello/hello.hpp b/lib/hello/hello.hpp
index 867e04e85001bd74ccb05d40f1ad63b05a67308f..cb3775748eaa94f09c883cdeb1661177b244923a 100644 (file)
--- a/lib/hello/hello.hpp
+++ b/lib/hello/hello.hpp
@@ -36,7 +36,7 @@ public:
        DECLARE_OBJECT(Hello);
        DECLARE_OBJECTNAME(Hello);
 
-       int Main(void);
+       virtual int Main(void) override;
 };
 
 }

diff --git a/lib/icinga/checkable.hpp b/lib/icinga/checkable.hpp
index dfe4d6f9b22d5cbe085e6e7e1e9389abc0581273..6afd3a321d5b63206f69559c0412fa8e192f62f2 100644 (file)
--- a/lib/icinga/checkable.hpp
+++ b/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;

diff --git a/lib/icinga/command.hpp b/lib/icinga/command.hpp
index c52d31d63737d0640510875b875f402234ae64d9..0df51562c9915ebd6fc789e1a918a23652d18611 100644 (file)
--- a/lib/icinga/command.hpp
+++ b/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;
 };
 
 }

diff --git a/lib/icinga/dependency.hpp b/lib/icinga/dependency.hpp
index 2b38a32a34d885b6472e489899ac9147e1816040..8a85de1734a4ead8979264d21382addfe661c10b 100644 (file)
--- a/lib/icinga/dependency.hpp
+++ b/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;

diff --git a/lib/icinga/host.hpp b/lib/icinga/host.hpp
index 18adeddad18fe089a45727c51f6876912d4eb0c4..1759a4cf7e8c794fc7de168cff6c15e075530f65 100644 (file)
--- a/lib/icinga/host.hpp
+++ b/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;

diff --git a/lib/icinga/icingaapplication.hpp b/lib/icinga/icingaapplication.hpp
index 796a5c9c0f86a10a25fe02d863853178ce190e09..e1250e9885de1de987d9fd03def0474bfcc128a5 100644 (file)
--- a/lib/icinga/icingaapplication.hpp
+++ b/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;
 };
 
 }

diff --git a/lib/icinga/icingastatuswriter.hpp b/lib/icinga/icingastatuswriter.hpp
index 80b4182cca508ca7364fc16c79a78c4389d32333..e2a458640eaa5e245a0dd4624993f5c68b586b9d 100644 (file)
--- a/lib/icinga/icingastatuswriter.hpp
+++ b/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;

diff --git a/lib/icinga/notification.hpp b/lib/icinga/notification.hpp
index 9b3881a4e75887a50b99e63759422f1df97151fd..4fa7538d82458042b8854a36e3ca8f08865c4dd0 100644 (file)
--- a/lib/icinga/notification.hpp
+++ b/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 = "");

diff --git a/lib/icinga/scheduleddowntime.hpp b/lib/icinga/scheduleddowntime.hpp
index 5eac7c6a8ba42162b6eabbfc2f12d192a2167ac1..592f23865fd8817844e550ad5f519fd92d9db0ea 100644 (file)
--- a/lib/icinga/scheduleddowntime.hpp
+++ b/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);

diff --git a/lib/icinga/service.hpp b/lib/icinga/service.hpp
index b682e8a2c9e2978aaf9883097858cdff69345610..08af8c34b12e5ee27e9bc9a8975c2fe9a0f4536a 100644 (file)
--- a/lib/icinga/service.hpp
+++ b/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;

diff --git a/lib/icinga/timeperiod.hpp b/lib/icinga/timeperiod.hpp
index 843808155830a78e709d7fbe2549901c5540768b..f7120c1f13ec70c62e6b8cf41d19b0b4ab6f4fa8 100644 (file)
--- a/lib/icinga/timeperiod.hpp
+++ b/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);

diff --git a/lib/icinga/user.hpp b/lib/icinga/user.hpp
index 382f5a5d11c440410b6e0be4213182146adaabe5..40c7a7dc15abe043a4f8c8ebd93f51f8c1816276 100644 (file)
--- a/lib/icinga/user.hpp
+++ b/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;
 };

diff --git a/lib/livestatus/livestatuslistener.hpp b/lib/livestatus/livestatuslistener.hpp
index 6886866a3df8c674087e168f33dc95a35602b1ce..f0b1f12b5d3a965befa4fe9022a9ee692871d134 100644 (file)
--- a/lib/livestatus/livestatuslistener.hpp
+++ b/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);

diff --git a/lib/notification/notificationcomponent.hpp b/lib/notification/notificationcomponent.hpp
index 88e8fd0a570bc9e1b007cce5a173bc9b51eb0e71..bc1dc1d9a0a89271efbffc929761c303a921d745 100644 (file)
--- a/lib/notification/notificationcomponent.hpp
+++ b/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;

diff --git a/lib/perfdata/gelfwriter.hpp b/lib/perfdata/gelfwriter.hpp
index 7b2dc6847a88a0ee47200edba7496e26fb058e82..78af64d7e828be66f0e843fd0fd3cf9e37b9c0ef 100644 (file)
--- a/lib/perfdata/gelfwriter.hpp
+++ b/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;

diff --git a/lib/perfdata/graphitewriter.hpp b/lib/perfdata/graphitewriter.hpp
index 32d961bbd7b4593c95bff06fe4b96dd3b9d81c55..2e06b01e75200e81c08fdb16ba95047d8d09fdbe 100644 (file)
--- a/lib/perfdata/graphitewriter.hpp
+++ b/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;

diff --git a/lib/perfdata/opentsdbwriter.hpp b/lib/perfdata/opentsdbwriter.hpp
index 02649cbcc25ce567927a1d73ed9365977c48e6ef..94868ab6bf0b744f484f6611289e83f857a1d535 100644 (file)
--- a/lib/perfdata/opentsdbwriter.hpp
+++ b/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;

diff --git a/lib/perfdata/perfdatawriter.hpp b/lib/perfdata/perfdatawriter.hpp
index b5f40629699a676983348659479e3a164865adcf..12999c40600ec229d9dbfa1ff9184e3543d6418e 100644 (file)
--- a/lib/perfdata/perfdatawriter.hpp
+++ b/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);

diff --git a/lib/remote/apilistener.hpp b/lib/remote/apilistener.hpp
index 7368439b1553091bba6103d82e3555153a6a4de8..03559a1e1752570f082ec875338bd10b0509ac32 100644 (file)
--- a/lib/remote/apilistener.hpp
+++ b/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;

diff --git a/lib/remote/endpoint.hpp b/lib/remote/endpoint.hpp
index e02438e07a045b9658cffcd18753e4f47f87cf32..0738572fe9049f47b5249ba60a705ad79377c91e 100644 (file)
--- a/lib/remote/endpoint.hpp
+++ b/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;