From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Tue, 9 Jul 2013 06:42:08 +0000 (+0200)
Subject: Add DECLARE_PTR_TYPEDEFS macro for Ptr/WeakPtr typedefs.
X-Git-Tag: v0.0.3~878
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4961523e912a145ce5abedc3363b5738fec9f303;p=icinga2

Add DECLARE_PTR_TYPEDEFS macro for Ptr/WeakPtr typedefs.
---

diff --git a/components/checker/checkercomponent.h b/components/checker/checkercomponent.h
index 65d56a723..dfcc83967 100644
--- a/components/checker/checkercomponent.h
+++ b/components/checker/checkercomponent.h
@@ -63,8 +63,7 @@ struct ServiceNextCheckExtractor
 class CheckerComponent : public DynamicObject
 {
 public:
-	typedef shared_ptr<CheckerComponent> Ptr;
-	typedef weak_ptr<CheckerComponent> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(CheckerComponent);
 
 	typedef boost::multi_index_container<
 		Service::Ptr,
diff --git a/components/compat/checkresultreader.h b/components/compat/checkresultreader.h
index 2b6695f6d..3820103d2 100644
--- a/components/compat/checkresultreader.h
+++ b/components/compat/checkresultreader.h
@@ -36,8 +36,7 @@ namespace icinga
 class CheckResultReader : public DynamicObject
 {
 public:
-	typedef shared_ptr<CheckResultReader> Ptr;
-	typedef weak_ptr<CheckResultReader> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(CheckResultReader);
 
 	CheckResultReader(const Dictionary::Ptr& properties);
 
diff --git a/components/compat/compatcomponent.h b/components/compat/compatcomponent.h
index e36ec079b..e42052b64 100644
--- a/components/compat/compatcomponent.h
+++ b/components/compat/compatcomponent.h
@@ -45,6 +45,8 @@ enum CompatObjectType
 class CompatComponent : public DynamicObject
 {
 public:
+	DECLARE_PTR_TYPEDEFS(CompatComponent);
+
 	CompatComponent(const Dictionary::Ptr& serializedUpdate);
 
 	virtual void Start(void);
diff --git a/components/compat/compatlog.h b/components/compat/compatlog.h
index 5e739c136..b45ef13f3 100644
--- a/components/compat/compatlog.h
+++ b/components/compat/compatlog.h
@@ -37,8 +37,7 @@ namespace icinga
 class CompatLog : public DynamicObject
 {
 public:
-	typedef shared_ptr<CompatLog> Ptr;
-	typedef weak_ptr<CompatLog> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(CompatLog);
 
 	CompatLog(const Dictionary::Ptr& serializedUpdate);
 
diff --git a/components/delegation/delegationcomponent.h b/components/delegation/delegationcomponent.h
index fe8a5cba7..362bf834f 100644
--- a/components/delegation/delegationcomponent.h
+++ b/components/delegation/delegationcomponent.h
@@ -34,6 +34,8 @@ namespace icinga
 class DelegationComponent : public DynamicObject
 {
 public:
+	DECLARE_PTR_TYPEDEFS(DelegationComponent);
+
 	DelegationComponent(const Dictionary::Ptr& serializedUpdate);
 
 	virtual void Start(void);
diff --git a/components/demo/democomponent.h b/components/demo/democomponent.h
index 43f8cc16e..a1bcba871 100644
--- a/components/demo/democomponent.h
+++ b/components/demo/democomponent.h
@@ -33,6 +33,8 @@ namespace icinga
 class DemoComponent : public DynamicObject
 {
 public:
+	DECLARE_PTR_TYPEDEFS(DemoComponent);
+
 	DemoComponent(const Dictionary::Ptr& serializedUpdate);
 
 	virtual void Start(void);
diff --git a/components/livestatus/andfilter.h b/components/livestatus/andfilter.h
index 520606058..aafe5bf98 100644
--- a/components/livestatus/andfilter.h
+++ b/components/livestatus/andfilter.h
@@ -33,8 +33,7 @@ namespace livestatus
 class AndFilter : public CombinerFilter
 {
 public:
-	typedef shared_ptr<AndFilter> Ptr;
-	typedef weak_ptr<AndFilter> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(AndFilter);
 
 	AndFilter(void);
 
diff --git a/components/livestatus/attributefilter.h b/components/livestatus/attributefilter.h
index 0e3f3b71f..939f030d6 100644
--- a/components/livestatus/attributefilter.h
+++ b/components/livestatus/attributefilter.h
@@ -33,8 +33,7 @@ namespace livestatus
 class AttributeFilter : public Filter
 {
 public:
-	typedef shared_ptr<AttributeFilter> Ptr;
-	typedef weak_ptr<AttributeFilter> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(AttributeFilter);
 
 	AttributeFilter(const String& column, const String& op, const String& operand);
 
diff --git a/components/livestatus/combinerfilter.h b/components/livestatus/combinerfilter.h
index 70538172d..01a372cfe 100644
--- a/components/livestatus/combinerfilter.h
+++ b/components/livestatus/combinerfilter.h
@@ -33,8 +33,7 @@ namespace livestatus
 class CombinerFilter : public Filter
 {
 public:
-	typedef shared_ptr<CombinerFilter> Ptr;
-	typedef weak_ptr<CombinerFilter> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(CombinerFilter);
 
 	CombinerFilter(void);
 
diff --git a/components/livestatus/commentstable.h b/components/livestatus/commentstable.h
index 56197e56d..b47d36493 100644
--- a/components/livestatus/commentstable.h
+++ b/components/livestatus/commentstable.h
@@ -33,8 +33,7 @@ namespace livestatus
 class CommentsTable : public Table
 {
 public:
-	typedef shared_ptr<CommentsTable> Ptr;
-	typedef weak_ptr<CommentsTable> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(CommentsTable);
 
 	CommentsTable(void);
 
diff --git a/components/livestatus/contactgroupstable.h b/components/livestatus/contactgroupstable.h
index 6710ffab2..247a68942 100644
--- a/components/livestatus/contactgroupstable.h
+++ b/components/livestatus/contactgroupstable.h
@@ -33,8 +33,7 @@ namespace livestatus
 class ContactGroupsTable : public Table
 {
 public:
-	typedef shared_ptr<ContactGroupsTable> Ptr;
-	typedef weak_ptr<ContactGroupsTable> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(ContactGroupsTable);
 
 	ContactGroupsTable(void);
 
diff --git a/components/livestatus/contactstable.h b/components/livestatus/contactstable.h
index 744f7f178..673a61d38 100644
--- a/components/livestatus/contactstable.h
+++ b/components/livestatus/contactstable.h
@@ -33,8 +33,7 @@ namespace livestatus
 class ContactsTable : public Table
 {
 public:
-	typedef shared_ptr<ContactsTable> Ptr;
-	typedef weak_ptr<ContactsTable> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(ContactsTable);
 
 	ContactsTable(void);
 
diff --git a/components/livestatus/downtimestable.h b/components/livestatus/downtimestable.h
index ee38f9bf1..e14bb29e0 100644
--- a/components/livestatus/downtimestable.h
+++ b/components/livestatus/downtimestable.h
@@ -33,8 +33,7 @@ namespace livestatus
 class DowntimesTable : public Table
 {
 public:
-	typedef shared_ptr<DowntimesTable> Ptr;
-	typedef weak_ptr<DowntimesTable> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(DowntimesTable);
 
 	DowntimesTable(void);
 
diff --git a/components/livestatus/filter.h b/components/livestatus/filter.h
index 68dfef619..1038da9cc 100644
--- a/components/livestatus/filter.h
+++ b/components/livestatus/filter.h
@@ -31,8 +31,7 @@ namespace livestatus
 class Filter : public Object
 {
 public:
-	typedef shared_ptr<Filter> Ptr;
-	typedef weak_ptr<Filter> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(Filter);
 
 	virtual bool Apply(const Table::Ptr& table, const Object::Ptr& object) = 0;
 
diff --git a/components/livestatus/hoststable.h b/components/livestatus/hoststable.h
index 6c8fdd692..24bc21334 100644
--- a/components/livestatus/hoststable.h
+++ b/components/livestatus/hoststable.h
@@ -33,8 +33,7 @@ namespace livestatus
 class HostsTable : public Table
 {
 public:
-	typedef shared_ptr<HostsTable> Ptr;
-	typedef weak_ptr<HostsTable> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(HostsTable);
 
 	HostsTable(void);
 
diff --git a/components/livestatus/negatefilter.h b/components/livestatus/negatefilter.h
index 18759345c..3461c0f8b 100644
--- a/components/livestatus/negatefilter.h
+++ b/components/livestatus/negatefilter.h
@@ -33,8 +33,7 @@ namespace livestatus
 class NegateFilter : public Filter
 {
 public:
-	typedef shared_ptr<NegateFilter> Ptr;
-	typedef weak_ptr<NegateFilter> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(NegateFilter);
 
 	NegateFilter(const Filter::Ptr& inner);
 
diff --git a/components/livestatus/orfilter.h b/components/livestatus/orfilter.h
index 2d323f1b3..207207575 100644
--- a/components/livestatus/orfilter.h
+++ b/components/livestatus/orfilter.h
@@ -33,8 +33,7 @@ namespace livestatus
 class OrFilter : public CombinerFilter
 {
 public:
-	typedef shared_ptr<OrFilter> Ptr;
-	typedef weak_ptr<OrFilter> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(OrFilter);
 
 	OrFilter(void);
 
diff --git a/components/livestatus/query.h b/components/livestatus/query.h
index 2d8362d9b..270aa6abe 100644
--- a/components/livestatus/query.h
+++ b/components/livestatus/query.h
@@ -37,8 +37,7 @@ namespace livestatus
 class Query : public Object
 {
 public:
-	typedef shared_ptr<Query> Ptr;
-	typedef weak_ptr<Query> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(Query);
 
 	Query(const std::vector<String>& lines);
 
diff --git a/components/livestatus/servicestable.h b/components/livestatus/servicestable.h
index 33a80248e..e45ee3b14 100644
--- a/components/livestatus/servicestable.h
+++ b/components/livestatus/servicestable.h
@@ -33,8 +33,7 @@ namespace livestatus
 class ServicesTable : public Table
 {
 public:
-	typedef shared_ptr<ServicesTable> Ptr;
-	typedef weak_ptr<ServicesTable> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(ServicesTable);
 
 	ServicesTable(void);
 
diff --git a/components/livestatus/statustable.h b/components/livestatus/statustable.h
index 5a891e7e3..dcde0473d 100644
--- a/components/livestatus/statustable.h
+++ b/components/livestatus/statustable.h
@@ -33,8 +33,7 @@ namespace livestatus
 class StatusTable : public Table
 {
 public:
-	typedef shared_ptr<StatusTable> Ptr;
-	typedef weak_ptr<StatusTable> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(StatusTable);
 
 	StatusTable(void);
 
diff --git a/components/livestatus/table.h b/components/livestatus/table.h
index 78beb1a7a..0614aa95d 100644
--- a/components/livestatus/table.h
+++ b/components/livestatus/table.h
@@ -36,8 +36,7 @@ class Filter;
 class Table : public Object
 {
 public:
-	typedef shared_ptr<Table> Ptr;
-	typedef weak_ptr<Table> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(Table);
 
 	typedef boost::function<void (const Object::Ptr&)> AddRowFunction;
 
diff --git a/components/notification/notificationcomponent.h b/components/notification/notificationcomponent.h
index ab56d7d27..5cff72798 100644
--- a/components/notification/notificationcomponent.h
+++ b/components/notification/notificationcomponent.h
@@ -33,6 +33,8 @@ namespace icinga
 class NotificationComponent : public DynamicObject
 {
 public:
+	DECLARE_PTR_TYPEDEFS(NotificationComponent);
+
 	NotificationComponent(const Dictionary::Ptr& serializedUpdate);
 
 	virtual void Start(void);
diff --git a/components/replication/replicationcomponent.h b/components/replication/replicationcomponent.h
index d097e181c..1950ef22c 100644
--- a/components/replication/replicationcomponent.h
+++ b/components/replication/replicationcomponent.h
@@ -32,6 +32,8 @@ namespace icinga
 class ReplicationComponent : public DynamicObject
 {
 public:
+	DECLARE_PTR_TYPEDEFS(ReplicationComponent);
+
 	ReplicationComponent(const Dictionary::Ptr& serializedUpdate);
 
 	virtual void Start(void);
diff --git a/lib/base/application.h b/lib/base/application.h
index c4aaaec13..fdea6a092 100644
--- a/lib/base/application.h
+++ b/lib/base/application.h
@@ -35,8 +35,7 @@ class Component;
  */
 class I2_BASE_API Application : public DynamicObject {
 public:
-	typedef shared_ptr<Application> Ptr;
-	typedef weak_ptr<Application> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(Application);
 
 	explicit Application(const Dictionary::Ptr& serializedUpdate);
 	~Application(void);
diff --git a/lib/base/array.h b/lib/base/array.h
index cefba286d..fe9609300 100644
--- a/lib/base/array.h
+++ b/lib/base/array.h
@@ -35,8 +35,7 @@ namespace icinga
 class I2_BASE_API Array : public Object
 {
 public:
-	typedef shared_ptr<Array> Ptr;
-	typedef weak_ptr<Array> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(Array);
 
 	/**
 	 * An iterator that can be used to iterate over array elements.
diff --git a/lib/base/bufferedstream.h b/lib/base/bufferedstream.h
index 4176a7754..75934f553 100644
--- a/lib/base/bufferedstream.h
+++ b/lib/base/bufferedstream.h
@@ -35,8 +35,7 @@ namespace icinga
 class I2_BASE_API BufferedStream : public Stream
 {
 public:
-	typedef shared_ptr<BufferedStream> Ptr;
-	typedef weak_ptr<BufferedStream> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(BufferedStream);
 
 	BufferedStream(const Stream::Ptr& innerStream);
 	~BufferedStream(void);
diff --git a/lib/base/consolelogger.h b/lib/base/consolelogger.h
index 973d5fd21..f39ef56af 100644
--- a/lib/base/consolelogger.h
+++ b/lib/base/consolelogger.h
@@ -34,8 +34,7 @@ namespace icinga
 class I2_BASE_API ConsoleLogger : public StreamLogger
 {
 public:
-	typedef shared_ptr<ConsoleLogger> Ptr;
-	typedef weak_ptr<ConsoleLogger> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(ConsoleLogger);
 
 	explicit ConsoleLogger(const Dictionary::Ptr& serializedUpdate);
 };
diff --git a/lib/base/dictionary.h b/lib/base/dictionary.h
index 2bb9061af..8f8e669c3 100644
--- a/lib/base/dictionary.h
+++ b/lib/base/dictionary.h
@@ -36,8 +36,7 @@ namespace icinga
 class I2_BASE_API Dictionary : public Object
 {
 public:
-	typedef shared_ptr<Dictionary> Ptr;
-	typedef weak_ptr<Dictionary> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(Dictionary);
 
 	/**
 	 * An iterator that can be used to iterate over dictionary elements.
diff --git a/lib/base/dynamicobject.h b/lib/base/dynamicobject.h
index 0ad599c74..1308ab0a2 100644
--- a/lib/base/dynamicobject.h
+++ b/lib/base/dynamicobject.h
@@ -42,8 +42,7 @@ class DynamicType;
 class I2_BASE_API DynamicObject : public Object
 {
 public:
-	typedef shared_ptr<DynamicObject> Ptr;
-	typedef weak_ptr<DynamicObject> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(DynamicObject);
 
 	typedef std::map<String, AttributeHolder, string_iless> AttributeMap;
 	typedef AttributeMap::iterator AttributeIterator;
diff --git a/lib/base/dynamictype.h b/lib/base/dynamictype.h
index b4e65670d..7b7c8dd90 100644
--- a/lib/base/dynamictype.h
+++ b/lib/base/dynamictype.h
@@ -34,8 +34,7 @@ namespace icinga
 class I2_BASE_API DynamicType : public Object
 {
 public:
-	typedef shared_ptr<DynamicType> Ptr;
-	typedef weak_ptr<DynamicType> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(DynamicType);
 
 	typedef boost::function<DynamicObject::Ptr (const Dictionary::Ptr&)> ObjectFactory;
 
diff --git a/lib/base/fifo.h b/lib/base/fifo.h
index 97c81e1a1..cab32b160 100644
--- a/lib/base/fifo.h
+++ b/lib/base/fifo.h
@@ -34,10 +34,9 @@ namespace icinga
 class I2_BASE_API FIFO : public Stream
 {
 public:
-	static const size_t BlockSize = 16 * 1024;
+	DECLARE_PTR_TYPEDEFS(FIFO);
 
-	typedef shared_ptr<FIFO> Ptr;
-	typedef weak_ptr<FIFO> WeakPtr;
+	static const size_t BlockSize = 16 * 1024;
 
 	FIFO(void);
 	~FIFO(void);
diff --git a/lib/base/filelogger.h b/lib/base/filelogger.h
index 9c872b313..5ed0f2df7 100644
--- a/lib/base/filelogger.h
+++ b/lib/base/filelogger.h
@@ -34,8 +34,7 @@ namespace icinga
 class I2_BASE_API FileLogger : public StreamLogger
 {
 public:
-	typedef shared_ptr<FileLogger> Ptr;
-	typedef weak_ptr<FileLogger> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(FileLogger);
 
 	explicit FileLogger(const Dictionary::Ptr& serializedUpdate);
 
diff --git a/lib/base/logger.h b/lib/base/logger.h
index dc11f8109..085ebbb89 100644
--- a/lib/base/logger.h
+++ b/lib/base/logger.h
@@ -48,8 +48,7 @@ struct LogEntry {
 class I2_BASE_API Logger : public DynamicObject
 {
 public:
-	typedef shared_ptr<Logger> Ptr;
-	typedef weak_ptr<Logger> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(Logger);
 
 	explicit Logger(const Dictionary::Ptr& serializedUpdate);
 
diff --git a/lib/base/networkstream.h b/lib/base/networkstream.h
index cff765b48..018f02f30 100644
--- a/lib/base/networkstream.h
+++ b/lib/base/networkstream.h
@@ -35,8 +35,7 @@ namespace icinga
 class I2_BASE_API NetworkStream : public Stream
 {
 public:
-	typedef shared_ptr<NetworkStream> Ptr;
-	typedef weak_ptr<NetworkStream> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(NetworkStream);
 
 	NetworkStream(const Socket::Ptr& socket);
 
diff --git a/lib/base/object.h b/lib/base/object.h
index 2fcf8d240..2fe2c37be 100644
--- a/lib/base/object.h
+++ b/lib/base/object.h
@@ -44,6 +44,10 @@ namespace icinga
 
 class Value;
 
+#define DECLARE_PTR_TYPEDEFS(klass) \
+	typedef shared_ptr<klass> Ptr; \
+	typedef weak_ptr<klass> WeakPtr
+
 /**
  * Base class for all heap-allocated objects. At least one of its methods
  * has to be virtual for RTTI to work.
@@ -53,8 +57,7 @@ class Value;
 class I2_BASE_API Object : public boost::enable_shared_from_this<Object>
 {
 public:
-	typedef shared_ptr<Object> Ptr;
-	typedef weak_ptr<Object> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(Object);
 
 	Object(void);
 	virtual ~Object(void);
diff --git a/lib/base/process.h b/lib/base/process.h
index 1587752a6..79513122f 100644
--- a/lib/base/process.h
+++ b/lib/base/process.h
@@ -54,8 +54,7 @@ struct ProcessResult
 class I2_BASE_API Process : public Object
 {
 public:
-	typedef shared_ptr<Process> Ptr;
-	typedef weak_ptr<Process> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(Process);
 
 	static const std::deque<Process::Ptr>::size_type MaxTasksPerThread = 512;
 
diff --git a/lib/base/ringbuffer.h b/lib/base/ringbuffer.h
index 200ffecdf..bd0579f1f 100644
--- a/lib/base/ringbuffer.h
+++ b/lib/base/ringbuffer.h
@@ -35,8 +35,7 @@ namespace icinga
 class I2_BASE_API RingBuffer : public Object
 {
 public:
-	typedef shared_ptr<RingBuffer> Ptr;
-	typedef weak_ptr<RingBuffer> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(RingBuffer);
 
 	typedef std::vector<int>::size_type SizeType;
 
diff --git a/lib/base/script.h b/lib/base/script.h
index 7c359c7d0..e34d55d94 100644
--- a/lib/base/script.h
+++ b/lib/base/script.h
@@ -36,8 +36,7 @@ class ScriptInterpreter;
 class I2_BASE_API Script : public DynamicObject
 {
 public:
-	typedef shared_ptr<Script> Ptr;
-	typedef weak_ptr<Script> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(Script);
 
 	Script(const Dictionary::Ptr& serializedUpdate);
 
diff --git a/lib/base/scriptfunction.h b/lib/base/scriptfunction.h
index 3ad5184b6..bc19a1faf 100644
--- a/lib/base/scriptfunction.h
+++ b/lib/base/scriptfunction.h
@@ -38,8 +38,7 @@ namespace icinga
 class I2_BASE_API ScriptFunction : public Object
 {
 public:
-	typedef shared_ptr<ScriptFunction> Ptr;
-	typedef weak_ptr<ScriptFunction> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(ScriptFunction);
 
 	typedef boost::function<Value (const std::vector<Value>& arguments)> Callback;
 
diff --git a/lib/base/scriptinterpreter.h b/lib/base/scriptinterpreter.h
index 29659907d..a7e92a625 100644
--- a/lib/base/scriptinterpreter.h
+++ b/lib/base/scriptinterpreter.h
@@ -36,8 +36,7 @@ namespace icinga
 class I2_BASE_API ScriptInterpreter : public Object
 {
 public:
-	typedef shared_ptr<ScriptInterpreter> Ptr;
-	typedef weak_ptr<ScriptInterpreter> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(ScriptInterpreter);
 
 	~ScriptInterpreter(void);
 
diff --git a/lib/base/scriptlanguage.h b/lib/base/scriptlanguage.h
index edf9ace1f..b27b504ca 100644
--- a/lib/base/scriptlanguage.h
+++ b/lib/base/scriptlanguage.h
@@ -35,8 +35,7 @@ namespace icinga
 class I2_BASE_API ScriptLanguage : public Object
 {
 public:
-	typedef shared_ptr<ScriptLanguage> Ptr;
-	typedef weak_ptr<ScriptLanguage> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(ScriptLanguage);
 
 	static void Register(const String& name, const ScriptLanguage::Ptr& language);
 	static void Unregister(const String& name);
diff --git a/lib/base/socket.h b/lib/base/socket.h
index 94d6e9b26..d3218989e 100644
--- a/lib/base/socket.h
+++ b/lib/base/socket.h
@@ -37,8 +37,7 @@ namespace icinga {
 class I2_BASE_API Socket : public Object
 {
 public:
-	typedef shared_ptr<Socket> Ptr;
-	typedef weak_ptr<Socket> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(Socket);
 
 	Socket(void);
 	Socket(SOCKET fd);
diff --git a/lib/base/stdiostream.h b/lib/base/stdiostream.h
index 9e5b48b5a..f1b9079f5 100644
--- a/lib/base/stdiostream.h
+++ b/lib/base/stdiostream.h
@@ -29,8 +29,7 @@ namespace icinga {
 class StdioStream : public Stream
 {
 public:
-	typedef shared_ptr<StdioStream> Ptr;
-	typedef weak_ptr<StdioStream> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(StdioStream);
 
 	StdioStream(std::iostream *innerStream, bool ownsStream);
 	~StdioStream(void);
diff --git a/lib/base/stream.h b/lib/base/stream.h
index ce47d6ea1..3f0fa5e0c 100644
--- a/lib/base/stream.h
+++ b/lib/base/stream.h
@@ -48,8 +48,7 @@ struct ReadLineContext
 class I2_BASE_API Stream : public Object
 {
 public:
-	typedef shared_ptr<Stream> Ptr;
-	typedef weak_ptr<Stream> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(Stream);
 
 	/**
 	 * Reads data from the stream.
diff --git a/lib/base/streamlogger.h b/lib/base/streamlogger.h
index 1a7766d60..9d85c0e31 100644
--- a/lib/base/streamlogger.h
+++ b/lib/base/streamlogger.h
@@ -35,8 +35,7 @@ namespace icinga
 class I2_BASE_API StreamLogger : public Logger
 {
 public:
-	typedef shared_ptr<StreamLogger> Ptr;
-	typedef weak_ptr<StreamLogger> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(StreamLogger);
 
 	StreamLogger(const Dictionary::Ptr& serializedUpdate);
 	~StreamLogger(void);
diff --git a/lib/base/sysloglogger.h b/lib/base/sysloglogger.h
index 5d3860ec4..9a1bb0e00 100644
--- a/lib/base/sysloglogger.h
+++ b/lib/base/sysloglogger.h
@@ -35,8 +35,7 @@ namespace icinga
 class I2_BASE_API SyslogLogger : public Logger
 {
 public:
-	typedef shared_ptr<SyslogLogger> Ptr;
-	typedef weak_ptr<SyslogLogger> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(SyslogLogger);
 
 	explicit SyslogLogger(const Dictionary::Ptr& serializedUpdate);
 
diff --git a/lib/base/tcpsocket.h b/lib/base/tcpsocket.h
index eee873016..bc2a79722 100644
--- a/lib/base/tcpsocket.h
+++ b/lib/base/tcpsocket.h
@@ -34,8 +34,7 @@ namespace icinga
 class I2_BASE_API TcpSocket : public Socket
 {
 public:
-	typedef shared_ptr<TcpSocket> Ptr;
-	typedef weak_ptr<TcpSocket> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(TcpSocket);
 
 	void Bind(const String& service, int family);
 	void Bind(const String& node, const String& service, int family);
diff --git a/lib/base/timer.h b/lib/base/timer.h
index fdf572fc6..5011ebf61 100644
--- a/lib/base/timer.h
+++ b/lib/base/timer.h
@@ -36,8 +36,7 @@ struct TimerNextExtractor;
 class I2_BASE_API Timer : public Object
 {
 public:
-	typedef shared_ptr<Timer> Ptr;
-	typedef weak_ptr<Timer> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(Timer);
 
 	Timer(void);
 
diff --git a/lib/base/tlsstream.h b/lib/base/tlsstream.h
index 5741bc985..cd59ed51e 100644
--- a/lib/base/tlsstream.h
+++ b/lib/base/tlsstream.h
@@ -43,8 +43,7 @@ enum TlsRole
 class I2_BASE_API TlsStream : public Stream
 {
 public:
-	typedef shared_ptr<TlsStream> Ptr;
-	typedef weak_ptr<TlsStream> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(TlsStream);
 
 	TlsStream(const Stream::Ptr& innerStream, TlsRole role, shared_ptr<SSL_CTX> sslContext);
 
diff --git a/lib/base/unixsocket.h b/lib/base/unixsocket.h
index a82849699..fff1e3a25 100644
--- a/lib/base/unixsocket.h
+++ b/lib/base/unixsocket.h
@@ -30,8 +30,7 @@ namespace icinga
 class UnixSocket : public Socket
 {
 public:
-	typedef shared_ptr<UnixSocket> Ptr;
-	typedef weak_ptr<UnixSocket> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(UnixSocket);
 
 	UnixSocket(void);
 
diff --git a/lib/config/configitem.h b/lib/config/configitem.h
index 8b9e8a262..175544c8b 100644
--- a/lib/config/configitem.h
+++ b/lib/config/configitem.h
@@ -35,8 +35,7 @@ namespace icinga
  */
 class I2_CONFIG_API ConfigItem : public Object {
 public:
-	typedef shared_ptr<ConfigItem> Ptr;
-	typedef weak_ptr<ConfigItem> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(ConfigItem);
 
 	ConfigItem(const String& type, const String& name, const String& unit,
 	    bool abstract, const ExpressionList::Ptr& exprl, const std::vector<String>& parents,
diff --git a/lib/config/configitembuilder.h b/lib/config/configitembuilder.h
index 6b38ce618..27ba05130 100644
--- a/lib/config/configitembuilder.h
+++ b/lib/config/configitembuilder.h
@@ -38,8 +38,7 @@ namespace icinga
 class I2_CONFIG_API ConfigItemBuilder : public Object
 {
 public:
-	typedef shared_ptr<ConfigItemBuilder> Ptr;
-	typedef weak_ptr<ConfigItemBuilder> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(ConfigItemBuilder);
 
 	ConfigItemBuilder(void);
 	explicit ConfigItemBuilder(const DebugInfo& debugInfo);
diff --git a/lib/config/configtype.h b/lib/config/configtype.h
index e1f132f10..03dd9664c 100644
--- a/lib/config/configtype.h
+++ b/lib/config/configtype.h
@@ -36,8 +36,7 @@ namespace icinga
  */
 class I2_CONFIG_API ConfigType : public Object {
 public:
-	typedef shared_ptr<ConfigType> Ptr;
-	typedef weak_ptr<ConfigType> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(ConfigType);
 
 	ConfigType(const String& name, const DebugInfo& debuginfo);
 
diff --git a/lib/config/expressionlist.h b/lib/config/expressionlist.h
index 5dc3c6190..b809bd6ef 100644
--- a/lib/config/expressionlist.h
+++ b/lib/config/expressionlist.h
@@ -36,8 +36,7 @@ namespace icinga
 class I2_CONFIG_API ExpressionList : public Object
 {
 public:
-	typedef shared_ptr<ExpressionList> Ptr;
-	typedef weak_ptr<ExpressionList> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(ExpressionList);
 
 	void AddExpression(const Expression& expression);
 
diff --git a/lib/config/typerulelist.h b/lib/config/typerulelist.h
index 4bae5f528..57e20a163 100644
--- a/lib/config/typerulelist.h
+++ b/lib/config/typerulelist.h
@@ -47,8 +47,7 @@ enum TypeValidationResult
 class I2_CONFIG_API TypeRuleList : public Object
 {
 public:
-	typedef shared_ptr<TypeRuleList> Ptr;
-	typedef weak_ptr<TypeRuleList> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(TypeRuleList);
 
 	void SetValidator(const String& validator);
 	String GetValidator(void) const;
diff --git a/lib/icinga/checkcommand.h b/lib/icinga/checkcommand.h
index 2df7db5c3..4597ae2f8 100644
--- a/lib/icinga/checkcommand.h
+++ b/lib/icinga/checkcommand.h
@@ -34,8 +34,7 @@ namespace icinga
 class I2_BASE_API CheckCommand : public Command
 {
 public:
-	typedef shared_ptr<CheckCommand> Ptr;
-	typedef weak_ptr<CheckCommand> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(CheckCommand);
 
 	explicit CheckCommand(const Dictionary::Ptr& serializedUpdate);
 
diff --git a/lib/icinga/command.h b/lib/icinga/command.h
index cfa4a252a..cd671888f 100644
--- a/lib/icinga/command.h
+++ b/lib/icinga/command.h
@@ -38,8 +38,7 @@ namespace icinga
 class I2_BASE_API Command : public DynamicObject, public MacroResolver
 {
 public:
-	typedef shared_ptr<Command> Ptr;
-	typedef weak_ptr<Command> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(Command);
 
 	explicit Command(const Dictionary::Ptr& serializedUpdate);
 
diff --git a/lib/icinga/eventcommand.h b/lib/icinga/eventcommand.h
index 0c2d6e0b8..db8f98903 100644
--- a/lib/icinga/eventcommand.h
+++ b/lib/icinga/eventcommand.h
@@ -34,8 +34,7 @@ namespace icinga
 class I2_BASE_API EventCommand : public Command
 {
 public:
-	typedef shared_ptr<EventCommand> Ptr;
-	typedef weak_ptr<EventCommand> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(EventCommand);
 
 	explicit EventCommand(const Dictionary::Ptr& serializedUpdate);
 
diff --git a/lib/icinga/host.h b/lib/icinga/host.h
index 0b0ae8f11..954380ee1 100644
--- a/lib/icinga/host.h
+++ b/lib/icinga/host.h
@@ -77,8 +77,7 @@ enum StateType
 class I2_ICINGA_API Host : public DynamicObject, public MacroResolver
 {
 public:
-	typedef shared_ptr<Host> Ptr;
-	typedef weak_ptr<Host> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(Host);
 
 	explicit Host(const Dictionary::Ptr& serializedUpdate);
 	~Host(void);
diff --git a/lib/icinga/hostgroup.h b/lib/icinga/hostgroup.h
index 7399368ff..dcfd4b5cb 100644
--- a/lib/icinga/hostgroup.h
+++ b/lib/icinga/hostgroup.h
@@ -36,8 +36,7 @@ namespace icinga
 class I2_ICINGA_API HostGroup : public DynamicObject
 {
 public:
-	typedef shared_ptr<HostGroup> Ptr;
-	typedef weak_ptr<HostGroup> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(HostGroup);
 
 	explicit HostGroup(const Dictionary::Ptr& serializedUpdate);
 	~HostGroup(void);
diff --git a/lib/icinga/icingaapplication.h b/lib/icinga/icingaapplication.h
index 1f8d547af..fee06816f 100644
--- a/lib/icinga/icingaapplication.h
+++ b/lib/icinga/icingaapplication.h
@@ -36,8 +36,7 @@ namespace icinga
 class I2_ICINGA_API IcingaApplication : public Application, public MacroResolver
 {
 public:
-	typedef shared_ptr<IcingaApplication> Ptr;
-	typedef weak_ptr<IcingaApplication> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(IcingaApplication);
 
 	explicit IcingaApplication(const Dictionary::Ptr& serializedUpdate);
 
diff --git a/lib/icinga/macroresolver.h b/lib/icinga/macroresolver.h
index 5944c1422..de8003170 100644
--- a/lib/icinga/macroresolver.h
+++ b/lib/icinga/macroresolver.h
@@ -35,8 +35,7 @@ namespace icinga
 class I2_ICINGA_API MacroResolver
 {
 public:
-	typedef shared_ptr<MacroResolver> Ptr;
-	typedef weak_ptr<MacroResolver> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(MacroResolver);
 
 	virtual bool ResolveMacro(const String& macro, const Dictionary::Ptr& cr, String *result) const = 0;
 };
@@ -44,8 +43,7 @@ public:
 class I2_ICINGA_API StaticMacroResolver : public Object, public MacroResolver
 {
 public:
-	typedef shared_ptr<StaticMacroResolver> Ptr;
-	typedef weak_ptr<StaticMacroResolver> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(StaticMacroResolver);
 
 	StaticMacroResolver(void);
 
diff --git a/lib/icinga/notification.h b/lib/icinga/notification.h
index fdf28094b..0a10d9923 100644
--- a/lib/icinga/notification.h
+++ b/lib/icinga/notification.h
@@ -58,8 +58,7 @@ class NotificationCommand;
 class I2_ICINGA_API Notification : public DynamicObject, public MacroResolver
 {
 public:
-	typedef shared_ptr<Notification> Ptr;
-	typedef weak_ptr<Notification> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(Notification);
 
 	explicit Notification(const Dictionary::Ptr& serializedUpdate);
 	~Notification(void);
diff --git a/lib/icinga/notificationcommand.h b/lib/icinga/notificationcommand.h
index 41ed80d37..150a73ebd 100644
--- a/lib/icinga/notificationcommand.h
+++ b/lib/icinga/notificationcommand.h
@@ -36,8 +36,7 @@ class Notification;
 class I2_BASE_API NotificationCommand : public Command
 {
 public:
-	typedef shared_ptr<NotificationCommand> Ptr;
-	typedef weak_ptr<NotificationCommand> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(NotificationCommand);
 
 	explicit NotificationCommand(const Dictionary::Ptr& serializedUpdate);
 
diff --git a/lib/icinga/perfdatawriter.h b/lib/icinga/perfdatawriter.h
index ea20eafd9..cc5fd7532 100644
--- a/lib/icinga/perfdatawriter.h
+++ b/lib/icinga/perfdatawriter.h
@@ -37,8 +37,7 @@ namespace icinga
 class I2_ICINGA_API PerfdataWriter : public DynamicObject
 {
 public:
-	typedef shared_ptr<PerfdataWriter> Ptr;
-	typedef weak_ptr<PerfdataWriter> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(PerfdataWriter);
 
 	PerfdataWriter(const Dictionary::Ptr& properties);
 
diff --git a/lib/icinga/service.h b/lib/icinga/service.h
index 420303780..4305321ac 100644
--- a/lib/icinga/service.h
+++ b/lib/icinga/service.h
@@ -96,8 +96,7 @@ class EventCommand;
 class I2_ICINGA_API Service : public DynamicObject, public MacroResolver
 {
 public:
-	typedef shared_ptr<Service> Ptr;
-	typedef weak_ptr<Service> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(Service);
 
 	explicit Service(const Dictionary::Ptr& serializedUpdate);
 	~Service(void);
diff --git a/lib/icinga/servicegroup.h b/lib/icinga/servicegroup.h
index cec760ce9..18f6437f1 100644
--- a/lib/icinga/servicegroup.h
+++ b/lib/icinga/servicegroup.h
@@ -36,8 +36,7 @@ namespace icinga
 class I2_ICINGA_API ServiceGroup : public DynamicObject
 {
 public:
-	typedef shared_ptr<ServiceGroup> Ptr;
-	typedef weak_ptr<ServiceGroup> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(ServiceGroup);
 
 	explicit ServiceGroup(const Dictionary::Ptr& serializedUpdate);
 	~ServiceGroup(void);
diff --git a/lib/icinga/timeperiod.h b/lib/icinga/timeperiod.h
index 9f4036b64..36e7403db 100644
--- a/lib/icinga/timeperiod.h
+++ b/lib/icinga/timeperiod.h
@@ -35,8 +35,7 @@ namespace icinga
 class I2_ICINGA_API TimePeriod : public DynamicObject
 {
 public:
-	typedef shared_ptr<TimePeriod> Ptr;
-	typedef weak_ptr<TimePeriod> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(TimePeriod);
 
 	explicit TimePeriod(const Dictionary::Ptr& serializedUpdate);
 
diff --git a/lib/icinga/user.h b/lib/icinga/user.h
index cad26ad7a..6cf3bf19e 100644
--- a/lib/icinga/user.h
+++ b/lib/icinga/user.h
@@ -37,8 +37,7 @@ namespace icinga
 class I2_ICINGA_API User : public DynamicObject, public MacroResolver
 {
 public:
-	typedef shared_ptr<User> Ptr;
-	typedef weak_ptr<User> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(User);
 
 	explicit User(const Dictionary::Ptr& serializedUpdate);
 	~User(void);
diff --git a/lib/icinga/usergroup.h b/lib/icinga/usergroup.h
index 3447ae1b2..549da0060 100644
--- a/lib/icinga/usergroup.h
+++ b/lib/icinga/usergroup.h
@@ -35,8 +35,7 @@ namespace icinga
 class I2_ICINGA_API UserGroup : public DynamicObject
 {
 public:
-	typedef shared_ptr<UserGroup> Ptr;
-	typedef weak_ptr<UserGroup> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(UserGroup);
 
 	explicit UserGroup(const Dictionary::Ptr& serializedUpdate);
 	~UserGroup(void);
diff --git a/lib/python/pythoninterpreter.h b/lib/python/pythoninterpreter.h
index 15a8956e3..1f23d487b 100644
--- a/lib/python/pythoninterpreter.h
+++ b/lib/python/pythoninterpreter.h
@@ -35,8 +35,7 @@ namespace icinga
 class PythonInterpreter : public ScriptInterpreter
 {
 public:
-	typedef shared_ptr<PythonInterpreter> Ptr;
-	typedef weak_ptr<PythonInterpreter> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(PythonInterpreter);
 
 	PythonInterpreter(const PythonLanguage::Ptr& language, const Script::Ptr& script);
 	~PythonInterpreter(void);
diff --git a/lib/python/pythonlanguage.h b/lib/python/pythonlanguage.h
index 89fcc5eb4..237caed32 100644
--- a/lib/python/pythonlanguage.h
+++ b/lib/python/pythonlanguage.h
@@ -36,8 +36,7 @@ class PythonInterpreter;
 class PythonLanguage : public ScriptLanguage
 {
 public:
-	typedef shared_ptr<PythonLanguage> Ptr;
-	typedef weak_ptr<PythonLanguage> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(PythonLanguage);
 
 	PythonLanguage(void);
 	~PythonLanguage(void);
diff --git a/lib/remoting/endpoint.h b/lib/remoting/endpoint.h
index c8e7eee64..e813ef578 100644
--- a/lib/remoting/endpoint.h
+++ b/lib/remoting/endpoint.h
@@ -40,8 +40,7 @@ class EndpointManager;
 class I2_REMOTING_API Endpoint : public DynamicObject
 {
 public:
-	typedef shared_ptr<Endpoint> Ptr;
-	typedef weak_ptr<Endpoint> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(Endpoint);
 
 	typedef void (Callback)(const Endpoint::Ptr&, const Endpoint::Ptr&, const RequestMessage&);
 
diff --git a/lib/remoting/endpointmanager.h b/lib/remoting/endpointmanager.h
index c98c9265e..7de738541 100644
--- a/lib/remoting/endpointmanager.h
+++ b/lib/remoting/endpointmanager.h
@@ -39,8 +39,7 @@ namespace icinga
 class I2_REMOTING_API EndpointManager : public Object
 {
 public:
-	typedef shared_ptr<EndpointManager> Ptr;
-	typedef weak_ptr<EndpointManager> WeakPtr;
+	DECLARE_PTR_TYPEDEFS(EndpointManager);
 
 	EndpointManager(void);