From: Gunnar Beutner Date: Tue, 18 Aug 2015 05:46:04 +0000 (+0200) Subject: Fix compiler warnings X-Git-Tag: v2.4.0~402 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d118b71a2ae18833b8ea90c638ce75c3ec431430;p=icinga2 Fix compiler warnings fixes #9929 --- diff --git a/lib/base/application.hpp b/lib/base/application.hpp index 47b1c2915..fe6472dbc 100644 --- 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 88eb3fdde..083818955 100644 --- 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 m_Data; /**< The data for the array. */ diff --git a/lib/base/dictionary.hpp b/lib/base/dictionary.hpp index 152956ac1..0556aa31f 100644 --- 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 m_Data; /**< The data for the dictionary. */ diff --git a/lib/base/filelogger.hpp b/lib/base/filelogger.hpp index cf2d342ec..026e101b2 100644 --- 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 2d10a1334..7877e1961 100644 --- 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 062cb9c77..ed7cd9efc 100644 --- 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 7d4f2a358..e6b0875d0 100644 --- 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 Ptr -#define IMPL_TYPE_LOOKUP() \ - static intrusive_ptr TypeInstance; \ - virtual intrusive_ptr GetReflectionType(void) const \ - { \ - return TypeInstance; \ +#define IMPL_TYPE_LOOKUP_SUPER() \ + +#define IMPL_TYPE_LOOKUP() \ + static intrusive_ptr TypeInstance; \ + virtual intrusive_ptr 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 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 TypeInstance; + private: Object(const Object& other); Object& operator=(const Object& rhs); diff --git a/lib/base/streamlogger.hpp b/lib/base/streamlogger.hpp index 9ab84127a..68d70f9fb 100644 --- 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 3be5dcaed..2ef3ceeb5 100644 --- 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 1017e4bb0..c208ffa35 100644 --- 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 GetLoadDependencies(void) const; diff --git a/lib/checker/checkercomponent.hpp b/lib/checker/checkercomponent.hpp index e20c9a944..21389f8e7 100644 --- 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 dd87afa9c..15d6f52ef 100644 --- 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 4799f7d8d..79d08acce 100644 --- 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 6e83eaf23..41fba9673 100644 --- 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 1e6b919ee..a3c743fce 100644 --- 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 ad71a0165..4b725fed2 100644 --- 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 41cae1fd4..dd414186c 100644 --- 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 be009b5b9..f0998b18f 100644 --- 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 867e04e85..cb3775748 100644 --- 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 dfe4d6f9b..6afd3a321 100644 --- 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 c52d31d63..0df51562c 100644 --- 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 2b38a32a3..8a85de173 100644 --- a/lib/icinga/dependency.hpp +++ b/lib/icinga/dependency.hpp @@ -57,9 +57,9 @@ public: static void EvaluateApplyRules(const intrusive_ptr& 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 18adeddad..1759a4cf7 100644 --- 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 796a5c9c0..e1250e988 100644 --- 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 80b4182cc..e2a458640 100644 --- 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 9b3881a4e..4fa7538d8 100644 --- a/lib/icinga/notification.hpp +++ b/lib/icinga/notification.hpp @@ -116,10 +116,10 @@ public: static void EvaluateApplyRules(const intrusive_ptr& 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 5eac7c6a8..592f23865 100644 --- 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 b682e8a2c..08af8c34b 100644 --- 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 843808155..f7120c1f1 100644 --- 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 382f5a5d1..40c7a7dc1 100644 --- 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 6886866a3..f0b1f12b5 100644 --- 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 88e8fd0a5..bc1dc1d9a 100644 --- 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 7b2dc6847..78af64d7e 100644 --- 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 32d961bbd..2e06b01e7 100644 --- 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 02649cbcc..94868ab6b 100644 --- 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 b5f406296..12999c406 100644 --- 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 7368439b1..03559a1e1 100644 --- 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 m_SSLContext; diff --git a/lib/remote/endpoint.hpp b/lib/remote/endpoint.hpp index e02438e07..0738572fe 100644 --- 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;