From 9e2aa4c5ede6ac4fa053a93c97a5a402068074aa Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Fri, 7 Nov 2014 18:37:07 +0100 Subject: [PATCH] Fix problem with unresolved symbols refs #7561 --- lib/base/sysloglogger.hpp | 2 +- lib/db_ido/commanddbobject.hpp | 2 +- lib/db_ido/dbobject.hpp | 2 +- lib/db_ido/dbtype.hpp | 2 +- lib/db_ido/dbvalue.hpp | 2 +- lib/db_ido/endpointdbobject.hpp | 2 +- lib/db_ido/hostdbobject.hpp | 2 +- lib/db_ido/hostgroupdbobject.hpp | 2 +- lib/db_ido/servicedbobject.hpp | 2 +- lib/db_ido/servicegroupdbobject.hpp | 2 +- lib/db_ido/timeperioddbobject.hpp | 2 +- lib/db_ido/userdbobject.hpp | 2 +- lib/db_ido/usergroupdbobject.hpp | 2 +- lib/livestatus/aggregator.hpp | 2 +- lib/livestatus/andfilter.hpp | 2 +- lib/livestatus/attributefilter.hpp | 2 +- lib/livestatus/avgaggregator.hpp | 2 +- lib/livestatus/combinerfilter.hpp | 2 +- lib/livestatus/commandstable.hpp | 2 +- lib/livestatus/commentstable.hpp | 2 +- lib/livestatus/contactgroupstable.hpp | 2 +- lib/livestatus/contactstable.hpp | 2 +- lib/livestatus/countaggregator.hpp | 2 +- lib/livestatus/downtimestable.hpp | 2 +- lib/livestatus/endpointstable.hpp | 2 +- lib/livestatus/filter.hpp | 2 +- lib/livestatus/hostgroupstable.hpp | 2 +- lib/livestatus/hoststable.hpp | 2 +- lib/livestatus/invavgaggregator.hpp | 2 +- lib/livestatus/invsumaggregator.hpp | 2 +- lib/livestatus/livestatusquery.hpp | 2 +- lib/livestatus/logtable.hpp | 2 +- lib/livestatus/maxaggregator.hpp | 2 +- lib/livestatus/minaggregator.hpp | 2 +- lib/livestatus/negatefilter.hpp | 2 +- lib/livestatus/orfilter.hpp | 2 +- lib/livestatus/servicegroupstable.hpp | 2 +- lib/livestatus/servicestable.hpp | 2 +- lib/livestatus/statehisttable.hpp | 2 +- lib/livestatus/statustable.hpp | 2 +- lib/livestatus/stdaggregator.hpp | 2 +- lib/livestatus/sumaggregator.hpp | 2 +- lib/livestatus/table.hpp | 2 +- lib/livestatus/timeperiodstable.hpp | 2 +- 44 files changed, 44 insertions(+), 44 deletions(-) diff --git a/lib/base/sysloglogger.hpp b/lib/base/sysloglogger.hpp index d29d2627d..4910b0179 100644 --- a/lib/base/sysloglogger.hpp +++ b/lib/base/sysloglogger.hpp @@ -20,10 +20,10 @@ #ifndef SYSLOGLOGGER_H #define SYSLOGLOGGER_H +#ifndef _WIN32 #include "base/i2-base.hpp" #include "base/sysloglogger.thpp" -#ifndef _WIN32 namespace icinga { diff --git a/lib/db_ido/commanddbobject.hpp b/lib/db_ido/commanddbobject.hpp index 58d601350..c414b6cd7 100644 --- a/lib/db_ido/commanddbobject.hpp +++ b/lib/db_ido/commanddbobject.hpp @@ -34,7 +34,7 @@ namespace icinga class CommandDbObject : public DbObject { public: - DECLARE_OBJECT(CommandDbObject); + DECLARE_PTR_TYPEDEFS(CommandDbObject); CommandDbObject(const shared_ptr& type, const String& name1, const String& name2); diff --git a/lib/db_ido/dbobject.hpp b/lib/db_ido/dbobject.hpp index 32eb567bf..80f85bbd2 100644 --- a/lib/db_ido/dbobject.hpp +++ b/lib/db_ido/dbobject.hpp @@ -61,7 +61,7 @@ enum DbObjectType class I2_DB_IDO_API DbObject : public Object { public: - DECLARE_OBJECT(DbObject); + DECLARE_PTR_TYPEDEFS(DbObject); static void StaticInitialize(void); diff --git a/lib/db_ido/dbtype.hpp b/lib/db_ido/dbtype.hpp index 4a5a66558..199a04b2c 100644 --- a/lib/db_ido/dbtype.hpp +++ b/lib/db_ido/dbtype.hpp @@ -39,7 +39,7 @@ class DbObject; class I2_DB_IDO_API DbType : public Object { public: - DECLARE_OBJECT(DbType); + DECLARE_PTR_TYPEDEFS(DbType); typedef boost::function (const shared_ptr&, const String&, const String&)> ObjectFactory; typedef std::map TypeMap; diff --git a/lib/db_ido/dbvalue.hpp b/lib/db_ido/dbvalue.hpp index 89a0a9704..1c7e184ab 100644 --- a/lib/db_ido/dbvalue.hpp +++ b/lib/db_ido/dbvalue.hpp @@ -42,7 +42,7 @@ enum DbValueType struct I2_DB_IDO_API DbValue : public Object { public: - DECLARE_OBJECT(DbValue); + DECLARE_PTR_TYPEDEFS(DbValue); DbValue(DbValueType type, const Value& value); diff --git a/lib/db_ido/endpointdbobject.hpp b/lib/db_ido/endpointdbobject.hpp index 6598b1b24..e11fe1b85 100644 --- a/lib/db_ido/endpointdbobject.hpp +++ b/lib/db_ido/endpointdbobject.hpp @@ -35,7 +35,7 @@ namespace icinga class EndpointDbObject : public DbObject { public: - DECLARE_OBJECT(EndpointDbObject); + DECLARE_PTR_TYPEDEFS(EndpointDbObject); EndpointDbObject(const shared_ptr& type, const String& name1, const String& name2); diff --git a/lib/db_ido/hostdbobject.hpp b/lib/db_ido/hostdbobject.hpp index cb2449aa3..aabf45401 100644 --- a/lib/db_ido/hostdbobject.hpp +++ b/lib/db_ido/hostdbobject.hpp @@ -34,7 +34,7 @@ namespace icinga class HostDbObject : public DbObject { public: - DECLARE_OBJECT(HostDbObject); + DECLARE_PTR_TYPEDEFS(HostDbObject); HostDbObject(const DbType::Ptr& type, const String& name1, const String& name2); diff --git a/lib/db_ido/hostgroupdbobject.hpp b/lib/db_ido/hostgroupdbobject.hpp index 2fa717fee..d9f4c6a2d 100644 --- a/lib/db_ido/hostgroupdbobject.hpp +++ b/lib/db_ido/hostgroupdbobject.hpp @@ -35,7 +35,7 @@ namespace icinga class HostGroupDbObject : public DbObject { public: - DECLARE_OBJECT(HostGroupDbObject); + DECLARE_PTR_TYPEDEFS(HostGroupDbObject); HostGroupDbObject(const DbType::Ptr& type, const String& name1, const String& name2); diff --git a/lib/db_ido/servicedbobject.hpp b/lib/db_ido/servicedbobject.hpp index 43e3f338b..c99d4a824 100644 --- a/lib/db_ido/servicedbobject.hpp +++ b/lib/db_ido/servicedbobject.hpp @@ -35,7 +35,7 @@ namespace icinga class ServiceDbObject : public DbObject { public: - DECLARE_OBJECT(ServiceDbObject); + DECLARE_PTR_TYPEDEFS(ServiceDbObject); ServiceDbObject(const DbType::Ptr& type, const String& name1, const String& name2); diff --git a/lib/db_ido/servicegroupdbobject.hpp b/lib/db_ido/servicegroupdbobject.hpp index a91f5a867..dc79ef766 100644 --- a/lib/db_ido/servicegroupdbobject.hpp +++ b/lib/db_ido/servicegroupdbobject.hpp @@ -35,7 +35,7 @@ namespace icinga class ServiceGroupDbObject : public DbObject { public: - DECLARE_OBJECT(ServiceGroupDbObject); + DECLARE_PTR_TYPEDEFS(ServiceGroupDbObject); ServiceGroupDbObject(const DbType::Ptr& type, const String& name1, const String& name2); diff --git a/lib/db_ido/timeperioddbobject.hpp b/lib/db_ido/timeperioddbobject.hpp index b568b0e63..b68eebe43 100644 --- a/lib/db_ido/timeperioddbobject.hpp +++ b/lib/db_ido/timeperioddbobject.hpp @@ -34,7 +34,7 @@ namespace icinga class TimePeriodDbObject : public DbObject { public: - DECLARE_OBJECT(TimePeriodDbObject); + DECLARE_PTR_TYPEDEFS(TimePeriodDbObject); TimePeriodDbObject(const DbType::Ptr& type, const String& name1, const String& name2); diff --git a/lib/db_ido/userdbobject.hpp b/lib/db_ido/userdbobject.hpp index 2f4da9a2b..6ad2225a4 100644 --- a/lib/db_ido/userdbobject.hpp +++ b/lib/db_ido/userdbobject.hpp @@ -34,7 +34,7 @@ namespace icinga class UserDbObject : public DbObject { public: - DECLARE_OBJECT(UserDbObject); + DECLARE_PTR_TYPEDEFS(UserDbObject); UserDbObject(const DbType::Ptr& type, const String& name1, const String& name2); diff --git a/lib/db_ido/usergroupdbobject.hpp b/lib/db_ido/usergroupdbobject.hpp index ee9d36b01..05e9ef2ba 100644 --- a/lib/db_ido/usergroupdbobject.hpp +++ b/lib/db_ido/usergroupdbobject.hpp @@ -35,7 +35,7 @@ namespace icinga class UserGroupDbObject : public DbObject { public: - DECLARE_OBJECT(UserGroupDbObject); + DECLARE_PTR_TYPEDEFS(UserGroupDbObject); UserGroupDbObject(const DbType::Ptr& type, const String& name1, const String& name2); diff --git a/lib/livestatus/aggregator.hpp b/lib/livestatus/aggregator.hpp index 9e4a05c85..7c933b824 100644 --- a/lib/livestatus/aggregator.hpp +++ b/lib/livestatus/aggregator.hpp @@ -32,7 +32,7 @@ namespace icinga class Aggregator : public Object { public: - DECLARE_OBJECT(Aggregator); + DECLARE_PTR_TYPEDEFS(Aggregator); virtual void Apply(const Table::Ptr& table, const Value& row) = 0; virtual double GetResult(void) const = 0; diff --git a/lib/livestatus/andfilter.hpp b/lib/livestatus/andfilter.hpp index 9d36e4cfc..5b8a6b76f 100644 --- a/lib/livestatus/andfilter.hpp +++ b/lib/livestatus/andfilter.hpp @@ -33,7 +33,7 @@ namespace icinga class AndFilter : public CombinerFilter { public: - DECLARE_OBJECT(AndFilter); + DECLARE_PTR_TYPEDEFS(AndFilter); AndFilter(void); diff --git a/lib/livestatus/attributefilter.hpp b/lib/livestatus/attributefilter.hpp index 08a9aed67..43d750bb3 100644 --- a/lib/livestatus/attributefilter.hpp +++ b/lib/livestatus/attributefilter.hpp @@ -33,7 +33,7 @@ namespace icinga class AttributeFilter : public Filter { public: - DECLARE_OBJECT(AttributeFilter); + DECLARE_PTR_TYPEDEFS(AttributeFilter); AttributeFilter(const String& column, const String& op, const String& operand); diff --git a/lib/livestatus/avgaggregator.hpp b/lib/livestatus/avgaggregator.hpp index 4906dc5fe..851a01796 100644 --- a/lib/livestatus/avgaggregator.hpp +++ b/lib/livestatus/avgaggregator.hpp @@ -32,7 +32,7 @@ namespace icinga class AvgAggregator : public Aggregator { public: - DECLARE_OBJECT(AvgAggregator); + DECLARE_PTR_TYPEDEFS(AvgAggregator); AvgAggregator(const String& attr); diff --git a/lib/livestatus/combinerfilter.hpp b/lib/livestatus/combinerfilter.hpp index ecfefee6c..d962c36f2 100644 --- a/lib/livestatus/combinerfilter.hpp +++ b/lib/livestatus/combinerfilter.hpp @@ -33,7 +33,7 @@ namespace icinga class CombinerFilter : public Filter { public: - DECLARE_OBJECT(CombinerFilter); + DECLARE_PTR_TYPEDEFS(CombinerFilter); CombinerFilter(void); diff --git a/lib/livestatus/commandstable.hpp b/lib/livestatus/commandstable.hpp index 36794b4a6..44bcf917a 100644 --- a/lib/livestatus/commandstable.hpp +++ b/lib/livestatus/commandstable.hpp @@ -33,7 +33,7 @@ namespace icinga class CommandsTable : public Table { public: - DECLARE_OBJECT(CommandsTable); + DECLARE_PTR_TYPEDEFS(CommandsTable); CommandsTable(void); diff --git a/lib/livestatus/commentstable.hpp b/lib/livestatus/commentstable.hpp index a42a4b9c7..0918c59f9 100644 --- a/lib/livestatus/commentstable.hpp +++ b/lib/livestatus/commentstable.hpp @@ -33,7 +33,7 @@ namespace icinga class CommentsTable : public Table { public: - DECLARE_OBJECT(CommentsTable); + DECLARE_PTR_TYPEDEFS(CommentsTable); CommentsTable(void); diff --git a/lib/livestatus/contactgroupstable.hpp b/lib/livestatus/contactgroupstable.hpp index dd34ee387..26f41b5e2 100644 --- a/lib/livestatus/contactgroupstable.hpp +++ b/lib/livestatus/contactgroupstable.hpp @@ -33,7 +33,7 @@ namespace icinga class ContactGroupsTable : public Table { public: - DECLARE_OBJECT(ContactGroupsTable); + DECLARE_PTR_TYPEDEFS(ContactGroupsTable); ContactGroupsTable(void); diff --git a/lib/livestatus/contactstable.hpp b/lib/livestatus/contactstable.hpp index 3f9084efb..eefc5ddc2 100644 --- a/lib/livestatus/contactstable.hpp +++ b/lib/livestatus/contactstable.hpp @@ -33,7 +33,7 @@ namespace icinga class ContactsTable : public Table { public: - DECLARE_OBJECT(ContactsTable); + DECLARE_PTR_TYPEDEFS(ContactsTable); ContactsTable(void); diff --git a/lib/livestatus/countaggregator.hpp b/lib/livestatus/countaggregator.hpp index 5e927934a..61860962e 100644 --- a/lib/livestatus/countaggregator.hpp +++ b/lib/livestatus/countaggregator.hpp @@ -32,7 +32,7 @@ namespace icinga class CountAggregator : public Aggregator { public: - DECLARE_OBJECT(CountAggregator); + DECLARE_PTR_TYPEDEFS(CountAggregator); CountAggregator(void); diff --git a/lib/livestatus/downtimestable.hpp b/lib/livestatus/downtimestable.hpp index b45d3940b..29435346d 100644 --- a/lib/livestatus/downtimestable.hpp +++ b/lib/livestatus/downtimestable.hpp @@ -33,7 +33,7 @@ namespace icinga class DowntimesTable : public Table { public: - DECLARE_OBJECT(DowntimesTable); + DECLARE_PTR_TYPEDEFS(DowntimesTable); DowntimesTable(void); diff --git a/lib/livestatus/endpointstable.hpp b/lib/livestatus/endpointstable.hpp index 5d43e6dc2..9ccc9f230 100644 --- a/lib/livestatus/endpointstable.hpp +++ b/lib/livestatus/endpointstable.hpp @@ -33,7 +33,7 @@ namespace icinga class EndpointsTable : public Table { public: - DECLARE_OBJECT(EndpointsTable); + DECLARE_PTR_TYPEDEFS(EndpointsTable); EndpointsTable(void); diff --git a/lib/livestatus/filter.hpp b/lib/livestatus/filter.hpp index 3ee1e7c77..f8d9d1ed5 100644 --- a/lib/livestatus/filter.hpp +++ b/lib/livestatus/filter.hpp @@ -31,7 +31,7 @@ namespace icinga class Filter : public Object { public: - DECLARE_OBJECT(Filter); + DECLARE_PTR_TYPEDEFS(Filter); virtual bool Apply(const Table::Ptr& table, const Value& row) = 0; diff --git a/lib/livestatus/hostgroupstable.hpp b/lib/livestatus/hostgroupstable.hpp index 68cd341d5..01872b4ae 100644 --- a/lib/livestatus/hostgroupstable.hpp +++ b/lib/livestatus/hostgroupstable.hpp @@ -33,7 +33,7 @@ namespace icinga class HostGroupsTable : public Table { public: - DECLARE_OBJECT(HostGroupsTable); + DECLARE_PTR_TYPEDEFS(HostGroupsTable); HostGroupsTable(void); diff --git a/lib/livestatus/hoststable.hpp b/lib/livestatus/hoststable.hpp index d033ad90b..5a62feadb 100644 --- a/lib/livestatus/hoststable.hpp +++ b/lib/livestatus/hoststable.hpp @@ -33,7 +33,7 @@ namespace icinga class HostsTable : public Table { public: - DECLARE_OBJECT(HostsTable); + DECLARE_PTR_TYPEDEFS(HostsTable); HostsTable(void); diff --git a/lib/livestatus/invavgaggregator.hpp b/lib/livestatus/invavgaggregator.hpp index adcfedc3b..d85898483 100644 --- a/lib/livestatus/invavgaggregator.hpp +++ b/lib/livestatus/invavgaggregator.hpp @@ -32,7 +32,7 @@ namespace icinga class InvAvgAggregator : public Aggregator { public: - DECLARE_OBJECT(InvAvgAggregator); + DECLARE_PTR_TYPEDEFS(InvAvgAggregator); InvAvgAggregator(const String& attr); diff --git a/lib/livestatus/invsumaggregator.hpp b/lib/livestatus/invsumaggregator.hpp index e288813c7..b15648bdc 100644 --- a/lib/livestatus/invsumaggregator.hpp +++ b/lib/livestatus/invsumaggregator.hpp @@ -32,7 +32,7 @@ namespace icinga class InvSumAggregator : public Aggregator { public: - DECLARE_OBJECT(InvSumAggregator); + DECLARE_PTR_TYPEDEFS(InvSumAggregator); InvSumAggregator(const String& attr); diff --git a/lib/livestatus/livestatusquery.hpp b/lib/livestatus/livestatusquery.hpp index da9a6d429..65af9fc38 100644 --- a/lib/livestatus/livestatusquery.hpp +++ b/lib/livestatus/livestatusquery.hpp @@ -45,7 +45,7 @@ enum LivestatusError class LivestatusQuery : public Object { public: - DECLARE_OBJECT(LivestatusQuery); + DECLARE_PTR_TYPEDEFS(LivestatusQuery); LivestatusQuery(const std::vector& lines, const String& compat_log_path); diff --git a/lib/livestatus/logtable.hpp b/lib/livestatus/logtable.hpp index 6f1c22cbe..44c3e1dc7 100644 --- a/lib/livestatus/logtable.hpp +++ b/lib/livestatus/logtable.hpp @@ -34,7 +34,7 @@ namespace icinga class LogTable : public HistoryTable { public: - DECLARE_OBJECT(LogTable); + DECLARE_PTR_TYPEDEFS(LogTable); LogTable(const String& compat_log_path, time_t from, time_t until); diff --git a/lib/livestatus/maxaggregator.hpp b/lib/livestatus/maxaggregator.hpp index 9f2a9b062..315874803 100644 --- a/lib/livestatus/maxaggregator.hpp +++ b/lib/livestatus/maxaggregator.hpp @@ -32,7 +32,7 @@ namespace icinga class MaxAggregator : public Aggregator { public: - DECLARE_OBJECT(MaxAggregator); + DECLARE_PTR_TYPEDEFS(MaxAggregator); MaxAggregator(const String& attr); diff --git a/lib/livestatus/minaggregator.hpp b/lib/livestatus/minaggregator.hpp index 7e36c71d3..d1280e3c7 100644 --- a/lib/livestatus/minaggregator.hpp +++ b/lib/livestatus/minaggregator.hpp @@ -32,7 +32,7 @@ namespace icinga class MinAggregator : public Aggregator { public: - DECLARE_OBJECT(MinAggregator); + DECLARE_PTR_TYPEDEFS(MinAggregator); MinAggregator(const String& attr); diff --git a/lib/livestatus/negatefilter.hpp b/lib/livestatus/negatefilter.hpp index 742a0bbcd..742902bf8 100644 --- a/lib/livestatus/negatefilter.hpp +++ b/lib/livestatus/negatefilter.hpp @@ -33,7 +33,7 @@ namespace icinga class NegateFilter : public Filter { public: - DECLARE_OBJECT(NegateFilter); + DECLARE_PTR_TYPEDEFS(NegateFilter); NegateFilter(const Filter::Ptr& inner); diff --git a/lib/livestatus/orfilter.hpp b/lib/livestatus/orfilter.hpp index f1a4794df..6f5fcf3c0 100644 --- a/lib/livestatus/orfilter.hpp +++ b/lib/livestatus/orfilter.hpp @@ -33,7 +33,7 @@ namespace icinga class OrFilter : public CombinerFilter { public: - DECLARE_OBJECT(OrFilter); + DECLARE_PTR_TYPEDEFS(OrFilter); OrFilter(void); diff --git a/lib/livestatus/servicegroupstable.hpp b/lib/livestatus/servicegroupstable.hpp index 4f01b6ebe..bad828410 100644 --- a/lib/livestatus/servicegroupstable.hpp +++ b/lib/livestatus/servicegroupstable.hpp @@ -33,7 +33,7 @@ namespace icinga class ServiceGroupsTable : public Table { public: - DECLARE_OBJECT(ServiceGroupsTable); + DECLARE_PTR_TYPEDEFS(ServiceGroupsTable); ServiceGroupsTable(void); diff --git a/lib/livestatus/servicestable.hpp b/lib/livestatus/servicestable.hpp index 7b7e037e9..bc0345012 100644 --- a/lib/livestatus/servicestable.hpp +++ b/lib/livestatus/servicestable.hpp @@ -33,7 +33,7 @@ namespace icinga class ServicesTable : public Table { public: - DECLARE_OBJECT(ServicesTable); + DECLARE_PTR_TYPEDEFS(ServicesTable); ServicesTable(void); diff --git a/lib/livestatus/statehisttable.hpp b/lib/livestatus/statehisttable.hpp index 18b9595c3..fa01cdca7 100644 --- a/lib/livestatus/statehisttable.hpp +++ b/lib/livestatus/statehisttable.hpp @@ -35,7 +35,7 @@ namespace icinga class StateHistTable : public HistoryTable { public: - DECLARE_OBJECT(StateHistTable); + DECLARE_PTR_TYPEDEFS(StateHistTable); StateHistTable(const String& compat_log_path, time_t from, time_t until); diff --git a/lib/livestatus/statustable.hpp b/lib/livestatus/statustable.hpp index 97da50975..43a694bde 100644 --- a/lib/livestatus/statustable.hpp +++ b/lib/livestatus/statustable.hpp @@ -33,7 +33,7 @@ namespace icinga class StatusTable : public Table { public: - DECLARE_OBJECT(StatusTable); + DECLARE_PTR_TYPEDEFS(StatusTable); StatusTable(void); diff --git a/lib/livestatus/stdaggregator.hpp b/lib/livestatus/stdaggregator.hpp index dfd0557e1..070bcca70 100644 --- a/lib/livestatus/stdaggregator.hpp +++ b/lib/livestatus/stdaggregator.hpp @@ -32,7 +32,7 @@ namespace icinga class StdAggregator : public Aggregator { public: - DECLARE_OBJECT(StdAggregator); + DECLARE_PTR_TYPEDEFS(StdAggregator); StdAggregator(const String& attr); diff --git a/lib/livestatus/sumaggregator.hpp b/lib/livestatus/sumaggregator.hpp index 811c62b4f..b5693a776 100644 --- a/lib/livestatus/sumaggregator.hpp +++ b/lib/livestatus/sumaggregator.hpp @@ -32,7 +32,7 @@ namespace icinga class SumAggregator : public Aggregator { public: - DECLARE_OBJECT(SumAggregator); + DECLARE_PTR_TYPEDEFS(SumAggregator); SumAggregator(const String& attr); diff --git a/lib/livestatus/table.hpp b/lib/livestatus/table.hpp index c04133fb5..5844f4acf 100644 --- a/lib/livestatus/table.hpp +++ b/lib/livestatus/table.hpp @@ -38,7 +38,7 @@ class Filter; class Table : public Object { public: - DECLARE_OBJECT(Table); + DECLARE_PTR_TYPEDEFS(Table); static Table::Ptr GetByName(const String& name, const String& compat_log_path = "", const unsigned long& from = 0, const unsigned long& until = 0); diff --git a/lib/livestatus/timeperiodstable.hpp b/lib/livestatus/timeperiodstable.hpp index bbf13617f..f473b1674 100644 --- a/lib/livestatus/timeperiodstable.hpp +++ b/lib/livestatus/timeperiodstable.hpp @@ -33,7 +33,7 @@ namespace icinga class TimePeriodsTable : public Table { public: - DECLARE_OBJECT(TimePeriodsTable); + DECLARE_PTR_TYPEDEFS(TimePeriodsTable); TimePeriodsTable(void); -- 2.40.0