From db90a785dbce1a1af4757eeeab4de213e90ef226 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Thu, 10 Oct 2013 23:30:05 +0200 Subject: [PATCH] Win64 build fix. --- components/livestatus/statustable.cpp | 4 ++-- lib/base/base.vcxproj | 4 ++-- lib/base/registry.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/components/livestatus/statustable.cpp b/components/livestatus/statustable.cpp index 7379d6d3b..1be42ebc1 100644 --- a/components/livestatus/statustable.cpp +++ b/components/livestatus/statustable.cpp @@ -145,12 +145,12 @@ Value StatusTable::ProgramStartAccessor(const Value& row) Value StatusTable::NumHostsAccessor(const Value& row) { - return DynamicType::GetObjects().size(); + return static_cast(DynamicType::GetObjects().size()); } Value StatusTable::NumServicesAccessor(const Value& row) { - return DynamicType::GetObjects().size(); + return static_cast(DynamicType::GetObjects().size()); } Value StatusTable::ProgramVersionAccessor(const Value& row) diff --git a/lib/base/base.vcxproj b/lib/base/base.vcxproj index bb8e0e86a..534e443d5 100644 --- a/lib/base/base.vcxproj +++ b/lib/base/base.vcxproj @@ -224,7 +224,7 @@ Windows true - dbghelp.lib;ws2_32.lib;shlwapi.lib;mmatch.lib;cJSON.lib;libeay32MTd.lib;ssleay32MTd.lib;%(AdditionalDependencies) + dbghelp.lib;ws2_32.lib;shlwapi.lib;mmatch.lib;cJSON.lib;%(AdditionalDependencies) ws2_32.lib;shlwapi.lib @@ -272,7 +272,7 @@ true true true - dbghelp.lib;ws2_32.lib;shlwapi.lib;mmatch.lib;cJSON.lib;libeay32MT.lib;ssleay32MT.lib;%(AdditionalDependencies) + dbghelp.lib;ws2_32.lib;shlwapi.lib;mmatch.lib;cJSON.lib;%(AdditionalDependencies) ws2_32.lib;shlwapi.lib diff --git a/lib/base/registry.h b/lib/base/registry.h index 552f8c32e..071a57292 100644 --- a/lib/base/registry.h +++ b/lib/base/registry.h @@ -69,7 +69,7 @@ public: void Unregister(const String& name) { - int erased; + size_t erased; { boost::mutex::scoped_lock lock(m_Mutex); -- 2.40.0