diff --git a/CMakeLists.txt b/CMakeLists.txt index 5cd70463..276fc1ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,8 +37,7 @@ endif() set(USE_PCH FALSE CACHE BOOL "Use shared precompiled headers for MSVC") -#include_directories(src contrib/eos_portable_archive contrib/db/liblmdb contrib contrib/epee/include "${CMAKE_BINARY_DIR}/version" "${CMAKE_BINARY_DIR}/contrib/zlib") -include_directories(src contrib/eos_portable_archive contrib/db/libmdbx contrib contrib/epee/include "${CMAKE_BINARY_DIR}/version" "${CMAKE_BINARY_DIR}/contrib/zlib") +include_directories(src contrib/eos_portable_archive contrib contrib/epee/include "${CMAKE_BINARY_DIR}/version" "${CMAKE_BINARY_DIR}/contrib/zlib") add_definitions(-DSTATICLIB) diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt index 09138237..36f7053c 100644 --- a/contrib/CMakeLists.txt +++ b/contrib/CMakeLists.txt @@ -12,7 +12,8 @@ set_property(TARGET zlibstatic PROPERTY FOLDER "contrib") set_property(TARGET ${DB_ENGINE} PROPERTY FOLDER "contrib") if(MSVC) - set_property(TARGET upnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267") + set_property(TARGET upnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " /wd4244 /wd4267") + set_property(TARGET zlibstatic APPEND_STRING PROPERTY COMPILE_FLAGS " /wd4267 /wd4267") else() set_property(TARGET upnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value -Wno-implicit-fallthrough -Wno-discarded-qualifiers ") set_property(TARGET zlibstatic APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value -Wno-implicit-fallthrough -Wno-discarded-qualifiers ") diff --git a/src/common/ntp.cpp b/src/common/ntp.cpp index 84a23b0a..84b40f8d 100644 --- a/src/common/ntp.cpp +++ b/src/common/ntp.cpp @@ -201,7 +201,7 @@ namespace tools udp_blocking_client ubc(sender_endpoint, socket, io_service); boost::system::error_code ec; - size_t len = ubc.receive(boost::asio::buffer(&packet_received, sizeof packet_received), boost::posix_time::seconds(timeout_sec), ec); + size_t len = ubc.receive(boost::asio::buffer(&packet_received, sizeof packet_received), boost::posix_time::seconds(static_cast(timeout_sec)), ec); if (ec) { LOG_PRINT_L3("NTP: get_ntp_time(" << host_name << "): boost error: " << ec.message());