From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Wed, 4 Apr 2012 08:21:14 +0000 (+0200)
Subject: Fixed compilation problem on *NIX.
X-Git-Tag: v0.0.1~645
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f20e71ace8a26ad1f189ed0e6515cc90198cd5b2;p=icinga2

Fixed compilation problem on *NIX.
---

diff --git a/base/cxx11-compat.h b/base/cxx11-compat.h
index db0a678d3..5f3cf0f54 100644
--- a/base/cxx11-compat.h
+++ b/base/cxx11-compat.h
@@ -10,13 +10,13 @@ shared_ptr<T> make_shared(void)
 template <typename T, typename TArg1>
 shared_ptr<T> make_shared(const TArg1& arg1)
 {
-	return shared_ptr<T>(new T());
+	return shared_ptr<T>(new T(arg1));
 }
 
 template <typename T, typename TArg1, typename TArg2>
 shared_ptr<T> make_shared(const TArg1& arg1, const TArg2& arg2)
 {
-	return shared_ptr<T>(new T());
+	return shared_ptr<T>(new T(arg1, arg2));
 }
 
 #endif /* CXX11COMPAT_H */
diff --git a/icinga/Makefile.am b/icinga/Makefile.am
index 598c4cd42..849f877c5 100644
--- a/icinga/Makefile.am
+++ b/icinga/Makefile.am
@@ -12,5 +12,5 @@ icinga_SOURCES =  \
 icinga_CXXFLAGS = -I${top_srcdir}/base \
 	-I${top_srcdir}/jsonrpc  -I${top_srcdir}
 
-icinga_LDFLAGS = $(top_builddir)/base/libbase.la \
-	$(top_builddir)/jsonrpc/libjsonrpc.la
\ No newline at end of file
+icinga_LDFLAGS = $(top_builddir)/jsonrpc/libjsonrpc.la \
+	$(top_builddir)/base/libbase.la
\ No newline at end of file
diff --git a/icinga/icingaapplication.cpp b/icinga/icingaapplication.cpp
index a807d1db3..b4bc9f59d 100644
--- a/icinga/icingaapplication.cpp
+++ b/icinga/icingaapplication.cpp
@@ -80,7 +80,7 @@ int IcingaApplication::NewComponentHandler(ConfigObjectEventArgs::Ptr ea)
 #ifdef _WIN32
 		path = object->GetName() + ".dll";
 #else /* _WIN32 */
-		path = "lib" + ea->Object->GetName() + ".la";
+		path = "lib" + object->GetName() + ".la";
 #endif /* _WIN32 */
 
 		// TODO: try to figure out where the component is located */