Replace CheckResult::StaticInitialize with a lambda function

diff --git a/lib/icinga/checkresult.cpp b/lib/icinga/checkresult.cpp
index 8140db4bc35300bf90196bb6fb746bc37eb5e106..a577c4998dd8608c3df9fc07a325080984c2d2c0 100644 (file)
--- a/lib/icinga/checkresult.cpp
+++ b/lib/icinga/checkresult.cpp
@@ -24,10 +24,8 @@
 using namespace icinga;
 
 REGISTER_TYPE(CheckResult);
-INITIALIZE_ONCE(&CheckResult::StaticInitialize);
 
-void CheckResult::StaticInitialize(void)
-{
+INITIALIZE_ONCE([]() {
        ScriptGlobal::Set("ServiceOK", ServiceOK);
        ScriptGlobal::Set("ServiceWarning", ServiceWarning);
        ScriptGlobal::Set("ServiceCritical", ServiceCritical);
@@ -35,7 +33,7 @@ void CheckResult::StaticInitialize(void)
 
        ScriptGlobal::Set("HostUp", HostUp);
        ScriptGlobal::Set("HostDown", HostDown);
-}
+})
 
 double CheckResult::CalculateExecutionTime(void) const
 {

diff --git a/lib/icinga/checkresult.hpp b/lib/icinga/checkresult.hpp
index 508d0ff7e3e6487ce25f023353d3f3e5330ee613..eeade11c84da6875af0b20cab20db7051b159bad 100644 (file)
--- a/lib/icinga/checkresult.hpp
+++ b/lib/icinga/checkresult.hpp
@@ -38,8 +38,6 @@ public:
 
        double CalculateExecutionTime(void) const;
        double CalculateLatency(void) const;
-
-       static void StaticInitialize(void);
 };
 
 }