Fix problem with unresolved symbols

refs #7561

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
 {
 

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<DbType>& type, const String& name1, const String& name2);
 

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);
 

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<shared_ptr<DbObject> (const shared_ptr<DbType>&, const String&, const String&)> ObjectFactory;
 	typedef std::map<String, DbType::Ptr> TypeMap;

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);
 

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<DbType>& type, const String& name1, const String& name2);
 

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);
 

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);
 

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);
 

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);
 

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);
 

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);
 

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);
 

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;

lib/livestatus/andfilter.hpp

@@ -33,7 +33,7 @@ namespace icinga
 class AndFilter : public CombinerFilter
 {
 public:
-	DECLARE_OBJECT(AndFilter);
+	DECLARE_PTR_TYPEDEFS(AndFilter);
 
 	AndFilter(void);
 

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);
 

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);
 

lib/livestatus/combinerfilter.hpp

@@ -33,7 +33,7 @@ namespace icinga
 class CombinerFilter : public Filter
 {
 public:
-	DECLARE_OBJECT(CombinerFilter);
+	DECLARE_PTR_TYPEDEFS(CombinerFilter);
 
 	CombinerFilter(void);
 

lib/livestatus/commandstable.hpp

@@ -33,7 +33,7 @@ namespace icinga
 class CommandsTable : public Table
 {
 public:
-	DECLARE_OBJECT(CommandsTable);
+	DECLARE_PTR_TYPEDEFS(CommandsTable);
 
 	CommandsTable(void);
 

lib/livestatus/commentstable.hpp

@@ -33,7 +33,7 @@ namespace icinga
 class CommentsTable : public Table
 {
 public:
-	DECLARE_OBJECT(CommentsTable);
+	DECLARE_PTR_TYPEDEFS(CommentsTable);
 
 	CommentsTable(void);
 

lib/livestatus/contactgroupstable.hpp

@@ -33,7 +33,7 @@ namespace icinga
 class ContactGroupsTable : public Table
 {
 public:
-	DECLARE_OBJECT(ContactGroupsTable);
+	DECLARE_PTR_TYPEDEFS(ContactGroupsTable);
 
 	ContactGroupsTable(void);
 

lib/livestatus/contactstable.hpp

@@ -33,7 +33,7 @@ namespace icinga
 class ContactsTable : public Table
 {
 public:
-	DECLARE_OBJECT(ContactsTable);
+	DECLARE_PTR_TYPEDEFS(ContactsTable);
 
 	ContactsTable(void);
 

lib/livestatus/countaggregator.hpp

@@ -32,7 +32,7 @@ namespace icinga
 class CountAggregator : public Aggregator
 {
 public:
-	DECLARE_OBJECT(CountAggregator);
+	DECLARE_PTR_TYPEDEFS(CountAggregator);
 
 	CountAggregator(void);
 

lib/livestatus/downtimestable.hpp

@@ -33,7 +33,7 @@ namespace icinga
 class DowntimesTable : public Table
 {
 public:
-	DECLARE_OBJECT(DowntimesTable);
+	DECLARE_PTR_TYPEDEFS(DowntimesTable);
 
 	DowntimesTable(void);
 

lib/livestatus/endpointstable.hpp

@@ -33,7 +33,7 @@ namespace icinga
 class EndpointsTable : public Table
 {
 public:
-	DECLARE_OBJECT(EndpointsTable);
+	DECLARE_PTR_TYPEDEFS(EndpointsTable);
 
 	EndpointsTable(void);
 

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;
 

lib/livestatus/hostgroupstable.hpp

@@ -33,7 +33,7 @@ namespace icinga
 class HostGroupsTable : public Table
 {
 public:
-	DECLARE_OBJECT(HostGroupsTable);
+	DECLARE_PTR_TYPEDEFS(HostGroupsTable);
 
 	HostGroupsTable(void);
 

lib/livestatus/hoststable.hpp

@@ -33,7 +33,7 @@ namespace icinga
 class HostsTable : public Table
 {
 public:
-	DECLARE_OBJECT(HostsTable);
+	DECLARE_PTR_TYPEDEFS(HostsTable);
 
 	HostsTable(void);
 

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);
 

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);
 

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<String>& lines, const String& compat_log_path);
 

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);
 

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);
 

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);
 

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);
 

lib/livestatus/orfilter.hpp

@@ -33,7 +33,7 @@ namespace icinga
 class OrFilter : public CombinerFilter
 {
 public:
-	DECLARE_OBJECT(OrFilter);
+	DECLARE_PTR_TYPEDEFS(OrFilter);
 
 	OrFilter(void);
 

lib/livestatus/servicegroupstable.hpp

@@ -33,7 +33,7 @@ namespace icinga
 class ServiceGroupsTable : public Table
 {
 public:
-	DECLARE_OBJECT(ServiceGroupsTable);
+	DECLARE_PTR_TYPEDEFS(ServiceGroupsTable);
 
 	ServiceGroupsTable(void);
 

lib/livestatus/servicestable.hpp

@@ -33,7 +33,7 @@ namespace icinga
 class ServicesTable : public Table
 {
 public:
-	DECLARE_OBJECT(ServicesTable);
+	DECLARE_PTR_TYPEDEFS(ServicesTable);
 
 	ServicesTable(void);
 

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);
 

lib/livestatus/statustable.hpp

@@ -33,7 +33,7 @@ namespace icinga
 class StatusTable : public Table
 {
 public:
-	DECLARE_OBJECT(StatusTable);
+	DECLARE_PTR_TYPEDEFS(StatusTable);
 
 	StatusTable(void);
 

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);
 

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);
 

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);
 

lib/livestatus/timeperiodstable.hpp

@@ -33,7 +33,7 @@ namespace icinga
 class TimePeriodsTable : public Table
 {
 public:
-	DECLARE_OBJECT(TimePeriodsTable);
+	DECLARE_PTR_TYPEDEFS(TimePeriodsTable);
 
 	TimePeriodsTable(void);