From a17c614d967cbc6e631c696af34d0c7dde384c60 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Fri, 13 Jul 2012 11:40:57 +0200 Subject: [PATCH] Fixed global macros. --- components/convenience/conveniencecomponent.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/components/convenience/conveniencecomponent.cpp b/components/convenience/conveniencecomponent.cpp index 0f32a63fc..8c7632fc7 100644 --- a/components/convenience/conveniencecomponent.cpp +++ b/components/convenience/conveniencecomponent.cpp @@ -56,7 +56,10 @@ void ConvenienceComponent::HostAddedHandler(const ConfigItem::Ptr& item) void ConvenienceComponent::CopyServiceAttributes(const ConfigObject::Ptr& host, const Dictionary::Ptr& service, const ConfigItemBuilder::Ptr& builder) { - Dictionary::Ptr macros; + /* TODO: we only need to copy macros if this is an inline definition, + * i.e. host->GetProperties() != service, however for now we just + * copy them anyway. */ + Dictionary::Ptr macros; if (service->Get("macros", ¯os)) builder->AddExpression("macros", OperatorPlus, macros); -- 2.50.1