Skip to content

boost > 1.83 compilation fixed #314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
neel wants to merge 3 commits into
base: master
Choose a base branch
from
Open

boost > 1.83 compilation fixed #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
550f26c
boost > 1.83 compilation fixed
neel Oct 12, 2024
169f19a
- compilation fixes for boost 1.87
neel Feb 17, 2025
2176a40
Merge branch 'master' of github.com:neel/ozo
neel Feb 17, 2025
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 include/ozo/asio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <boost/asio/io_service.hpp>
#include <boost/asio/io_context.hpp>
#include <boost/asio/executor.hpp>
#include <boost/asio/strand.hpp>
#include <boost/asio/steady_timer.hpp>
Expand Down
2 changes: 2 additions & 0 deletions include/ozo/detail/bind.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@

#include <ozo/asio.h>

#if BOOST_VERSION <= 108300
#include <boost/asio/handler_invoke_hook.hpp>
#endif

namespace ozo {
namespace detail {
Expand Down
8 changes: 4 additions & 4 deletions tests/failover/role_based.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ TEST(role_based_connection_provider__is_supported, should_return_false_for_conne

TEST(role_based_connection_provider__rebind, should_call_source_rebind_and_return_new_provider_for_role) {
role_based_connection_source_mock source;
boost::asio::io_service io;
boost::asio::io_context io;
auto provider = ozo::failover::role_based_connection_provider{
role_based_connection_source<class dummy> {std::addressof(source)},
io
Expand All @@ -125,7 +125,7 @@ TEST(role_based_connection_provider__rebind, should_call_source_rebind_and_retur

TEST(role_based_connection_provider__rebind, should_move_source_call_source_rebind_and_return_new_provider_for_role) {
role_based_connection_source_mock source;
boost::asio::io_service io;
boost::asio::io_context io;
auto provider = ozo::failover::role_based_connection_provider{
role_based_connection_source<class dummy> {std::addressof(source)},
io
Expand All @@ -146,7 +146,7 @@ using namespace std::literals;
struct role_based_try__initiate_next_try : Test {
StrictMock<connection_mock> conn;
role_based_connection_source_mock source;
boost::asio::io_service io;
boost::asio::io_context io;

auto provider() {
return ozo::failover::role_based_connection_provider{
Expand Down Expand Up @@ -328,7 +328,7 @@ TEST_F(role_based_try__initiate_next_try, should_not_close_connection_on_no_retr

struct role_based_try__get_context : Test {
role_based_connection_source_mock source;
boost::asio::io_service io;
boost::asio::io_context io;

auto provider() {
return ozo::failover::role_based_connection_provider{
Expand Down