From: Michael Friedrich Date: Sat, 21 May 2016 12:16:47 +0000 (+0200) Subject: Silence compiler warnings X-Git-Tag: v2.5.0~302 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f1a9f150b8ae211befa292cbea1db6932388c20;p=icinga2 Silence compiler warnings refs #11823 --- diff --git a/lib/icinga/checkable-check.cpp b/lib/icinga/checkable-check.cpp index d4cad9052..4151e167e 100644 --- a/lib/icinga/checkable-check.cpp +++ b/lib/icinga/checkable-check.cpp @@ -356,7 +356,7 @@ void Checkable::ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrig String new_state_str = (service ? Service::StateToString(new_state) : Host::StateToString(Host::CalculateState(new_state))); /* Whether a hard state change or a volatile state change except OK -> OK happened. */ - if (hardChange || is_volatile && !(IsStateOK(old_state) && IsStateOK(new_state))) { + if (hardChange || (is_volatile && !(IsStateOK(old_state) && IsStateOK(new_state)))) { OnStateChange(this, cr, StateTypeHard, origin); Log(LogNotice, "Checkable") << "State Change: Checkable " << GetName() << " hard state change from " << old_state_str << " to " << new_state_str << " detected." << (is_volatile ? " Checkable is volatile." : ""); @@ -367,7 +367,7 @@ void Checkable::ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrig } if (GetStateType() == StateTypeSoft || hardChange || recovery || - is_volatile && !(IsStateOK(old_state) && IsStateOK(new_state))) + (is_volatile && !(IsStateOK(old_state) && IsStateOK(new_state)))) ExecuteEventHandler(); if (send_downtime_notification)