Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions Release/cmake/cpprest_find_boost.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ function(cpprest_find_boost)
set(BOOST_LIBRARYDIR "${CMAKE_BINARY_DIR}/../Boost-for-Android/build/out/x86/lib" CACHE INTERNAL "")
set(Boost_ARCHITECTURE "-x32" CACHE INTERNAL "")
endif()
cpprestsdk_find_boost_android_package(Boost ${BOOST_VERSION} EXACT REQUIRED COMPONENTS random system thread filesystem chrono atomic)
cpprestsdk_find_boost_android_package(Boost ${BOOST_VERSION} EXACT REQUIRED COMPONENTS random thread filesystem chrono atomic)
elseif(UNIX)
find_package(Boost REQUIRED COMPONENTS random system thread filesystem chrono atomic date_time regex)
find_package(Boost REQUIRED COMPONENTS random thread filesystem chrono atomic date_time regex)
else()
find_package(Boost REQUIRED COMPONENTS system date_time regex)
find_package(Boost REQUIRED COMPONENTS date_time regex)
endif()

add_library(cpprestsdk_boost_internal INTERFACE)
Expand Down Expand Up @@ -78,7 +78,6 @@ function(cpprest_find_boost)
target_link_libraries(cpprestsdk_boost_internal INTERFACE
Boost::boost
Boost::random
Boost::system
Boost::thread
Boost::filesystem
Boost::chrono
Expand All @@ -88,7 +87,6 @@ function(cpprest_find_boost)
target_link_libraries(cpprestsdk_boost_internal INTERFACE
Boost::boost
Boost::random
Boost::system
Boost::thread
Boost::filesystem
Boost::chrono
Expand All @@ -99,7 +97,6 @@ function(cpprest_find_boost)
else()
target_link_libraries(cpprestsdk_boost_internal INTERFACE
Boost::boost
Boost::system
Boost::date_time
Boost::regex
)
Expand Down
4 changes: 2 additions & 2 deletions Release/cmake/cpprestsdk-config.in.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ endif()

if(@CPPREST_USES_BOOST@)
if(UNIX)
find_dependency(Boost COMPONENTS random system thread filesystem chrono atomic date_time regex)
find_dependency(Boost COMPONENTS random thread filesystem chrono atomic date_time regex)
else()
find_dependency(Boost COMPONENTS system date_time regex)
find_dependency(Boost COMPONENTS date_time regex)
endif()
endif()
include("${CMAKE_CURRENT_LIST_DIR}/cpprestsdk-targets.cmake")
4 changes: 2 additions & 2 deletions Release/src/http/client/http_client_asio.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ class asio_connection_pool final : public std::enable_shared_from_this<asio_conn
auto& self = *pool;
std::weak_ptr<asio_connection_pool> weak_pool = pool;

self.m_pool_epoch_timer.expires_from_now(boost::posix_time::seconds(30));
self.m_pool_epoch_timer.expires_after(std::chrono::seconds(30));
self.m_pool_epoch_timer.async_wait([weak_pool](const boost::system::error_code& ec) {
if (ec)
{
Expand Down Expand Up @@ -467,7 +467,7 @@ class asio_connection_pool final : public std::enable_shared_from_this<asio_conn
std::mutex m_lock;
std::map<std::string, connection_pool_stack<asio_connection>> m_connections;
bool m_is_timer_running;
boost::asio::deadline_timer m_pool_epoch_timer;
boost::asio::steady_timer m_pool_epoch_timer;
};

class asio_client final : public _http_client_communicator
Expand Down