From 41f620a8f08bb3cf97922feed1ca429eb28dc0e8 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Sun, 1 Apr 2012 13:57:22 +0200 Subject: [PATCH] Fixed more compilation problems. --- configrpccomponent/configrpccomponent.cpp | 10 +++++----- icinga/Makefile.am | 5 +++-- miniapp/Makefile.am | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/configrpccomponent/configrpccomponent.cpp b/configrpccomponent/configrpccomponent.cpp index ce741692f..e4be5255e 100644 --- a/configrpccomponent/configrpccomponent.cpp +++ b/configrpccomponent/configrpccomponent.cpp @@ -1,7 +1,7 @@ #include "i2-configrpccomponent.h" using namespace icinga; -using std::dynamic_pointer_cast; +using std::tr1::dynamic_pointer_cast; IcingaApplication::RefType ConfigRpcComponent::GetIcingaApplication(void) { @@ -81,7 +81,7 @@ int ConfigRpcComponent::FetchObjectsHandler(NewMessageEventArgs::RefType ea) int ConfigRpcComponent::LocalObjectCreatedHandler(ConfigHiveEventArgs::RefType ea) { ConnectionManager::RefType connectionManager = GetIcingaApplication()->GetConnectionManager(); - connectionManager->SendMessage(MakeObjectMessage(ea->ConfigObject, "config::ObjectCreated", true)); + connectionManager->SendMessage(MakeObjectMessage(ea->Object, "config::ObjectCreated", true)); return 0; } @@ -89,17 +89,17 @@ int ConfigRpcComponent::LocalObjectCreatedHandler(ConfigHiveEventArgs::RefType e int ConfigRpcComponent::LocalObjectRemovedHandler(ConfigHiveEventArgs::RefType ea) { ConnectionManager::RefType connectionManager = GetIcingaApplication()->GetConnectionManager(); - connectionManager->SendMessage(MakeObjectMessage(ea->ConfigObject, "config::ObjectRemoved", false)); + connectionManager->SendMessage(MakeObjectMessage(ea->Object, "config::ObjectRemoved", false)); return 0; } int ConfigRpcComponent::LocalPropertyChangedHandler(ConfigHiveEventArgs::RefType ea) { - JsonRpcMessage::RefType msg = MakeObjectMessage(ea->ConfigObject, "config::ObjectRemoved", false); + JsonRpcMessage::RefType msg = MakeObjectMessage(ea->Object, "config::ObjectRemoved", false); cJSON *params = msg->GetParams(); cJSON_AddStringToObject(params, "property", ea->Property.c_str()); - string value = ea->ConfigObject->GetProperty(ea->Property); + string value = ea->Object->GetProperty(ea->Property); cJSON_AddStringToObject(params, "value", value.c_str()); ConnectionManager::RefType connectionManager = GetIcingaApplication()->GetConnectionManager(); diff --git a/icinga/Makefile.am b/icinga/Makefile.am index ead535022..8eddb2eca 100644 --- a/icinga/Makefile.am +++ b/icinga/Makefile.am @@ -6,10 +6,11 @@ bin_PROGRAMS = \ icinga_SOURCES = \ icingaapplication.cpp \ - icingaapplication.h + icingaapplication.h \ + i2-icinga.h icinga_CXXFLAGS = -I${top_srcdir}/base \ -I${top_srcdir}/jsonrpc icinga_LDFLAGS = $(top_builddir)/base/libbase.a \ - $(top_builddir)/jsonrpc/libjsonrpc.a + $(top_builddir)/jsonrpc/libjsonrpc.a -lltdl diff --git a/miniapp/Makefile.am b/miniapp/Makefile.am index fd97f5d68..1ff548177 100644 --- a/miniapp/Makefile.am +++ b/miniapp/Makefile.am @@ -11,4 +11,4 @@ miniapp_CXXFLAGS = -I${top_srcdir}/base \ -I${top_srcdir}/jsonrpc miniapp_LDFLAGS = $(top_builddir)/base/libbase.a \ - $(top_builddir)/jsonrpc/libjsonrpc.a + $(top_builddir)/jsonrpc/libjsonrpc.a -lltdl -- 2.40.0