tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-24 06:05:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed compilation problem on *NIX.

Browse Source
This commit is contained in:
Gunnar Beutner 2012-04-04 10:21:14 +02:00
parent 5360a39cc5
commit f20e71ace8
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
base/cxx11-compat.h
View File

@ -10,13 +10,13 @@ shared_ptr<T> make_shared(void)
template <typename T, typename TArg1> template <typename T, typename TArg1>
shared_ptr<T> make_shared(const TArg1& arg1) 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> template <typename T, typename TArg1, typename TArg2>
shared_ptr<T> make_shared(const TArg1& arg1, const TArg2& arg2) 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 */ #endif /* CXX11COMPAT_H */

4
icinga/Makefile.am
View File

@ -12,5 +12,5 @@ icinga_SOURCES = \
icinga_CXXFLAGS = -I${top_srcdir}/base \ icinga_CXXFLAGS = -I${top_srcdir}/base \
-I${top_srcdir}/jsonrpc -I${top_srcdir} -I${top_srcdir}/jsonrpc -I${top_srcdir}
icinga_LDFLAGS = $(top_builddir)/base/libbase.la \ icinga_LDFLAGS = $(top_builddir)/jsonrpc/libjsonrpc.la \
$(top_builddir)/jsonrpc/libjsonrpc.la $(top_builddir)/base/libbase.la

2
icinga/icingaapplication.cpp
View File

@ -80,7 +80,7 @@ int IcingaApplication::NewComponentHandler(ConfigObjectEventArgs::Ptr ea)
#ifdef _WIN32 #ifdef _WIN32
path = object->GetName() + ".dll"; path = object->GetName() + ".dll";
#else /* _WIN32 */ #else /* _WIN32 */
path = "lib" + ea->Object->GetName() + ".la"; path = "lib" + object->GetName() + ".la";
#endif /* _WIN32 */ #endif /* _WIN32 */
// TODO: try to figure out where the component is located */ // TODO: try to figure out where the component is located */