Skip to content
This repository was archived by the owner on Apr 8, 2025. It is now read-only.

fix: support boost-1.87.0 #426

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
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
2 changes: 1 addition & 1 deletion Microsoft.WindowsAzure.Storage/includes/wascore/util.h
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ namespace azure { namespace storage { namespace core {
WASTORAGE_API static std::shared_ptr<web::http::client::http_client> get_http_client(const web::uri& uri, const web::http::client::http_client_config& config);

private:
static const boost::asio::io_service& s_service;
static const boost::asio::io_context& s_service;
WASTORAGE_API static std::map<utility::string_t, std::shared_ptr<web::http::client::http_client>> s_http_clients;
WASTORAGE_API static std::mutex s_mutex;
};
Expand Down
2 changes: 1 addition & 1 deletion Microsoft.WindowsAzure.Storage/src/cloud_common.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ namespace azure { namespace storage {
throw std::invalid_argument(protocol::error_invalid_ip_address);
#else
boost::system::error_code error;
auto addr = boost::asio::ip::address::from_string(address, error);
auto addr = boost::asio::ip::make_address(address, error);
if (error.value() == 0)
{
if (addr.is_v4())
Expand Down
2 changes: 1 addition & 1 deletion Microsoft.WindowsAzure.Storage/src/timer_handler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ namespace azure { namespace storage { namespace core {
pplx::task<void> timer_handler::timeout_after(const std::chrono::milliseconds& time)
{
m_timer = std::make_shared<boost::asio::basic_waitable_timer<std::chrono::steady_clock>>(crossplat::threadpool::shared_instance().service());
m_timer->expires_from_now(std::chrono::duration_cast<std::chrono::steady_clock::duration>(time));
m_timer->expires_after(std::chrono::duration_cast<std::chrono::steady_clock::duration>(time));
std::weak_ptr<timer_handler> weak_this_pointer = shared_from_this();
auto callback = [weak_this_pointer](const boost::system::error_code& ec)
{
Expand Down
2 changes: 1 addition & 1 deletion Microsoft.WindowsAzure.Storage/src/util.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ namespace azure { namespace storage { namespace core {
}

#ifndef _WIN32
const boost::asio::io_service& http_client_reusable::s_service = crossplat::threadpool::shared_instance().service();
const boost::asio::io_context& http_client_reusable::s_service = crossplat::threadpool::shared_instance().service();
std::map<utility::string_t, std::shared_ptr<web::http::client::http_client>> http_client_reusable::s_http_clients;
std::mutex http_client_reusable::s_mutex;

Expand Down