Fix some compiler warnings

fixes #7826

diff --git a/lib/base/scriptutils.cpp b/lib/base/scriptutils.cpp
index 5f5a08bdd5a07fce0d420ddc1748d5dbe99ca3f9..1109a272923098bbee725c2e161dbb3297f399e7 100644 (file)
--- a/lib/base/scriptutils.cpp
+++ b/lib/base/scriptutils.cpp
@@ -156,7 +156,7 @@ void ScriptUtils::Log(const std::vector<Value>& arguments)
                message = arguments[2];
        }
 
-       if (message.IsString() || !message.IsObjectType<Array>() && !message.IsObjectType<Dictionary>())
+       if (message.IsString() || (!message.IsObjectType<Array>() && !message.IsObjectType<Dictionary>()))
                ::Log(severity, facility, message);
        else
                ::Log(severity, facility, JsonEncode(message));

diff --git a/lib/config/expression.cpp b/lib/config/expression.cpp
index bd5bb7852ae6e646bd5e8588a9a535ec09ff9cfc..da9e32f1f7ba4bbfd1ab2e29619726c444bc27a2 100644 (file)
--- a/lib/config/expression.cpp
+++ b/lib/config/expression.cpp
@@ -352,6 +352,8 @@ Value ConditionalExpression::DoEvaluate(VMFrame& frame, DebugHint *dhint) const
                return m_TrueBranch->Evaluate(frame, dhint);
        else if (m_FalseBranch)
                return m_FalseBranch->Evaluate(frame, dhint);
+
+       return Empty;
 }
 
 Value ReturnExpression::DoEvaluate(VMFrame& frame, DebugHint *dhint) const

diff --git a/lib/icinga/dependency.hpp b/lib/icinga/dependency.hpp
index afea95920a316207a0cb4156f206d0a7101445aa..27d0c5d8d9e6751353be582e2737a43beb9e1ed6 100644 (file)
--- a/lib/icinga/dependency.hpp
+++ b/lib/icinga/dependency.hpp
@@ -28,7 +28,7 @@ namespace icinga
 {
 
 class ApplyRule;
-class VMFrame;
+struct VMFrame;
 class Host;
 class Service;
 

diff --git a/lib/icinga/notification.hpp b/lib/icinga/notification.hpp
index 4bc864331954d8838ff62276220d7f0a26fc01cb..3c1457e1fd90f7ba134f8893445e9c1bffb5b17d 100644 (file)
--- a/lib/icinga/notification.hpp
+++ b/lib/icinga/notification.hpp
@@ -68,7 +68,7 @@ enum NotificationType
 class NotificationCommand;
 class Checkable;
 class ApplyRule;
-class VMFrame;
+struct VMFrame;
 class Host;
 class Service;
 

diff --git a/lib/icinga/scheduleddowntime.hpp b/lib/icinga/scheduleddowntime.hpp
index 45fb63f3f2711e6de83308209d3f6273e3227b3e..5a709686c3fc48aa3327506863cba48aefce2a59 100644 (file)
--- a/lib/icinga/scheduleddowntime.hpp
+++ b/lib/icinga/scheduleddowntime.hpp
@@ -29,7 +29,7 @@ namespace icinga
 {
 
 class ApplyRule;
-class VMFrame;
+struct VMFrame;
 class Host;
 class Service;