]> granicus.if.org Git - icinga2/commitdiff
Fixed more compilation problems.
authorGunnar Beutner <gunnar.beutner@netways.de>
Sun, 1 Apr 2012 11:57:22 +0000 (13:57 +0200)
committerGunnar Beutner <gunnar.beutner@netways.de>
Sun, 1 Apr 2012 11:57:22 +0000 (13:57 +0200)
configrpccomponent/configrpccomponent.cpp
icinga/Makefile.am
miniapp/Makefile.am

index ce741692fc9fc2630a71b9245bb54b4f3c602b28..e4be5255e00d0d7a35deb4ccbd0e02bd5d77131a 100644 (file)
@@ -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();
index ead535022c7f7f174547eeef8b317c4b0e813cad..8eddb2ecaa2e519aec72efd131b01ec5f307cb9e 100644 (file)
@@ -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
index fd97f5d689d6622451d5fde4c7db4ef80216978e..1ff5481775ceca586a1f4a5ecd45419758761f2a 100644 (file)
@@ -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