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

Windows x64 build fix.

This commit is contained in:
Michael Friedrich 2013-08-20 12:50:24 +02:00
parent 82b3b81b91
commit b89f72b552
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/livestatus/hostgroupstable.cpp
View File

@ -153,7 +153,7 @@ Value HostGroupsTable::WorstHostStateAccessor(const Value& row)
Value HostGroupsTable::NumHostsAccessor(const Value& row) Value HostGroupsTable::NumHostsAccessor(const Value& row)
{ {
return static_cast<HostGroup::Ptr>(row)->GetMembers().size(); return static_cast<long>(static_cast<HostGroup::Ptr>(row)->GetMembers().size());
} }
Value HostGroupsTable::NumHostsPendingAccessor(const Value& row) Value HostGroupsTable::NumHostsPendingAccessor(const Value& row)

4
components/livestatus/query.cpp
View File

@ -192,7 +192,7 @@ Query::Query(const std::vector<String>& lines)
if (num > deq.size()) { if (num > deq.size()) {
m_Verb = "ERROR"; m_Verb = "ERROR";
m_ErrorCode = 451; m_ErrorCode = 451;
m_ErrorMessage = "Or/StatsOr is referencing " + Convert::ToString(num) + " filters; stack only contains " + Convert::ToString(deq.size()) + " filters"; m_ErrorMessage = "Or/StatsOr is referencing " + Convert::ToString(num) + " filters; stack only contains " + Convert::ToString(static_cast<long>(deq.size())) + " filters";
return; return;
} }
@ -440,7 +440,7 @@ void Query::PrintFixed16(const Stream::Ptr& stream, int code, const String& data
ASSERT(code >= 100 && code <= 999); ASSERT(code >= 100 && code <= 999);
String sCode = Convert::ToString(code); String sCode = Convert::ToString(code);
String sLength = Convert::ToString(data.GetLength()); String sLength = Convert::ToString(static_cast<long>(data.GetLength()));
String header = sCode + String(16 - 3 - sLength.GetLength() - 1, ' ') + sLength + m_Separators[0]; String header = sCode + String(16 - 3 - sLength.GetLength() - 1, ' ') + sLength + m_Separators[0];
stream->Write(header.CStr(), header.GetLength()); stream->Write(header.CStr(), header.GetLength());

2
components/livestatus/servicegroupstable.cpp
View File

@ -149,7 +149,7 @@ Value ServiceGroupsTable::WorstServiceStateAccessor(const Value& row)
Value ServiceGroupsTable::NumServicesAccessor(const Value& row) Value ServiceGroupsTable::NumServicesAccessor(const Value& row)
{ {
return static_cast<ServiceGroup::Ptr>(row)->GetMembers().size(); return static_cast<long>(static_cast<ServiceGroup::Ptr>(row)->GetMembers().size());
} }
Value ServiceGroupsTable::NumServicesOkAccessor(const Value& row) Value ServiceGroupsTable::NumServicesOkAccessor(const Value& row)

4
components/livestatus/statustable.cpp
View File

@ -334,12 +334,12 @@ Value StatusTable::IntervalLengthAccessor(const Value& row)
Value StatusTable::NumHostsAccessor(const Value& row) Value StatusTable::NumHostsAccessor(const Value& row)
{ {
return DynamicType::GetObjects("Host").size(); return static_cast<long>(DynamicType::GetObjects("Host").size());
} }
Value StatusTable::NumServicesAccessor(const Value& row) Value StatusTable::NumServicesAccessor(const Value& row)
{ {
return DynamicType::GetObjects("Service").size(); return static_cast<long>(DynamicType::GetObjects("Service").size());
} }
Value StatusTable::ProgramVersionAccessor(const Value& row) Value StatusTable::ProgramVersionAccessor(const Value& row)

2
lib/icinga/legacytimeperiod.cpp
View File

@ -429,7 +429,7 @@ Array::Ptr LegacyTimePeriod::ScriptFunc(const TimePeriod::Ptr& tp, double begin,
} }
} }
Log(LogDebug, "icinga", "Legacy timeperiod update returned " + Convert::ToString(segments->GetLength()) + " segments."); Log(LogDebug, "icinga", "Legacy timeperiod update returned " + Convert::ToString(static_cast<long>(segments->GetLength())) + " segments.");
return segments; return segments;
} }