Fixed compilation problem on *NIX.

diff --git a/base/cxx11-compat.h b/base/cxx11-compat.h
index db0a678d3e7c0d89c45786131ababedd2b6eb069..5f3cf0f54d266713dfb82cde4a0f153f194debde 100644 (file)
--- 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 598c4cd423c211a2890df2c3a642ca5f8052a85f..849f877c54b345f2fa8e11227374ed13eb31e471 100644 (file)
--- 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 a807d1db39a575a4e06a46dc1fec31aae8c1c1f3..b4bc9f59d9bcfa9ccf519b7d0738fa4712586e92 100644 (file)
--- 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 */