From: Gunnar Beutner Date: Thu, 19 Apr 2012 10:20:03 +0000 (+0200) Subject: Build fixes for *NIX. X-Git-Tag: v0.0.1~616 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=761d494d8eebdc156aca6d3bd82e015f44b65584;p=icinga2 Build fixes for *NIX. --- diff --git a/icinga/Makefile.am b/icinga/Makefile.am index f6dc16554..4a7292571 100644 --- a/icinga/Makefile.am +++ b/icinga/Makefile.am @@ -14,6 +14,8 @@ libicinga_la_SOURCES = \ i2-icinga.h \ jsonrpcendpoint.cpp \ jsonrpcendpoint.h \ + subscriptioncomponent.cpp \ + subscriptioncomponent.h \ virtualendpoint.cpp \ virtualendpoint.h diff --git a/icinga/endpointmanager.h b/icinga/endpointmanager.h index ed981297f..e125dc94d 100644 --- a/icinga/endpointmanager.h +++ b/icinga/endpointmanager.h @@ -6,7 +6,7 @@ namespace icinga struct I2_ICINGA_API NewEndpointEventArgs : public EventArgs { - Endpoint::Ptr Endpoint; + icinga::Endpoint::Ptr Endpoint; }; class I2_ICINGA_API EndpointManager : public Object diff --git a/icinga/jsonrpcendpoint.cpp b/icinga/jsonrpcendpoint.cpp index cc48665ac..ce322483f 100644 --- a/icinga/jsonrpcendpoint.cpp +++ b/icinga/jsonrpcendpoint.cpp @@ -32,7 +32,7 @@ bool JsonRpcEndpoint::IsLocal(void) const bool JsonRpcEndpoint::IsConnected(void) const { - return m_Client; + return (bool)m_Client; } void JsonRpcEndpoint::ProcessRequest(Endpoint::Ptr sender, const JsonRpcRequest& message)