Skip to content

Commit d877e81

Browse files
committed
Fix compiler warnings
1 parent 9612de8 commit d877e81

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

lib/icingadb/icingadb-objects.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1929,10 +1929,10 @@ unsigned short GetPreviousState(const Checkable::Ptr& checkable, const Service::
19291929
{
19301930
auto phs ((type == StateTypeHard ? checkable->GetLastHardStatesRaw() : checkable->GetLastSoftStatesRaw()) % 100u);
19311931

1932-
if (service) {
1932+
if (service || phs == 99) {
19331933
return phs;
19341934
} else {
1935-
return phs == 99 ? phs : Host::CalculateState(ServiceState(phs));
1935+
return Host::CalculateState(ServiceState(phs));
19361936
}
19371937
}
19381938

lib/icingadb/redisconnection.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ void RedisConnection::EnqueueCallback(const std::function<void(boost::asio::yiel
224224
auto ctime (Utility::GetTime());
225225

226226
asio::post(m_Strand, [this, callback, priority, ctime]() {
227-
m_Queues.Writes[priority].emplace(WriteQueueItem{nullptr, nullptr, nullptr, nullptr, callback, ctime});
227+
m_Queues.Writes[priority].emplace(WriteQueueItem{nullptr, nullptr, nullptr, nullptr, callback, ctime, QueryAffects{}});
228228
m_QueuedWrites.Set();
229229
});
230230
}

0 commit comments

Comments
 (0)