tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed assertion at program exit.

This commit is contained in:
Gunnar Beutner 2012-04-06 09:16:43 +02:00
parent 04472c5a85
commit 399b2eca19
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
base/application.cpp
View File

@ -377,11 +377,11 @@ static void application_sigint_handler(int signum)
Application::Instance->SigIntHandler(signum);
}
int application_main(int argc, char **argv, Application::Ptr instance)
int application_main(int argc, char **argv, Application *instance)
{
int result;
Application::Instance = instance;
Application::Instance = Application::Ptr(instance);
#ifndef _WIN32
struct sigaction sa;

4
base/application.h
View File

@ -50,11 +50,11 @@ public:
}
int I2_EXPORT application_main(int argc, char **argv, icinga::Application::Ptr instance);
int I2_EXPORT application_main(int argc, char **argv, icinga::Application *instance);
#define SET_START_CLASS(klass) \
int main(int argc, char **argv) { \
shared_ptr<klass> instance = make_shared<klass>(); \
klass *instance = new klass(); \
return application_main(argc, argv, instance); \
}