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

Fix some compiler warnings 

fixes #7826
This commit is contained in:
Gunnar Beutner 2014-11-24 18:24:47 +01:00
parent 7e13f7597f
commit fddead5303
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/base/scriptutils.cpp
View File

@ -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));

2
lib/config/expression.cpp
View File

@ -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

2
lib/icinga/dependency.hpp
View File

@ -28,7 +28,7 @@ namespace icinga
{
class ApplyRule;
class VMFrame;
struct VMFrame;
class Host;
class Service;

2
lib/icinga/notification.hpp
View File

@ -68,7 +68,7 @@ enum NotificationType
class NotificationCommand;
class Checkable;
class ApplyRule;
class VMFrame;
struct VMFrame;
class Host;
class Service;

2
lib/icinga/scheduleddowntime.hpp
View File

@ -29,7 +29,7 @@ namespace icinga
{
class ApplyRule;
class VMFrame;
struct VMFrame;
class Host;
class Service;