Skip to content

Commit df40dd7

Browse files
author
Adam Mensel
committed
Add BOOST_ASIO_NO_DEPRECATED for the build and fix the usages of deprecated APIs.
1 parent d3ea846 commit df40dd7

26 files changed

+55
-65
lines changed

‎CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ enable_testing()
1010

1111
add_definitions(-DBOOST_ERROR_CODE_HEADER_ONLY)
1212
add_definitions(-DBOOST_COROUTINES_NO_DEPRECATION_WARNING)
13+
add_definitions(-DBOOST_ASIO_NO_DEPRECATED)
1314
#add_definitions(-DBREDIS_DEBUG)
1415

1516
find_package(

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ using Iterator = typename r::to_iterator<Buffer>::iterator_t;
165165
...
166166
/* establishing connection to redis is outside of bredis */
167167
asio::ip::tcp::endpoint end_point(
168-
asio::ip::address::from_string("127.0.0.1"), port);
168+
asio::ip::make_address("127.0.0.1"), port);
169169
socket_t socket(io_service, end_point.protocol());
170170
socket.connect(end_point);
171171

@@ -234,7 +234,7 @@ using result_t = r::parse_result_mapper_t<Iterator, Policy>;
234234
...
235235
/* establishing the connection to redis is outside of bredis */
236236
asio::ip::tcp::endpoint end_point(
237-
asio::ip::address::from_string("127.0.0.1"), port);
237+
asio::ip::make_address("127.0.0.1"), port);
238238
socket_t socket(io_service, end_point.protocol());
239239
socket.connect(end_point);
240240
...
@@ -467,7 +467,7 @@ outside of the bredis connection.
467467
using socket_t = asio::ip::tcp::socket;
468468
using next_layer_t = socket_t &;
469469
...
470-
asio::ip::tcp::endpoint end_point(asio::ip::address::from_string("127.0.0.1"), port);
470+
asio::ip::tcp::endpoint end_point(asio::ip::make_address("127.0.0.1"), port);
471471
socket_t socket(io_service, end_point.protocol());
472472
socket.connect(end_point);
473473
r::Connection<next_layer_t> c(socket);

‎examples/multi-threads-1.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ int main(int argc, char **argv) {
138138
uint16_t port = vm.count("host") ? vm["port"].as<std::uint16_t>() : 6379;
139139

140140
asio::io_context io;
141-
//asio::io_service io_service;
142-
auto ip_address = asio::ip::address::from_string(host);
141+
//asio::io_context io_service;
142+
auto ip_address = asio::ip::make_address(host);
143143
std::cout << "connecting to " << host << ":" << port << "\n";
144144
asio::ip::tcp::endpoint end_point(ip_address, port);
145145
socket_t socket(io, end_point.protocol());

‎examples/speed_test_async_multi.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ int main(int argc, char **argv) {
9191

9292
r::command_wrapper_t cmd_wpapper{std::move(cmd_container)};
9393

94-
asio::io_service io_service;
95-
auto ip_address = asio::ip::address::from_string(dst_parts[0]);
94+
asio::io_context io_service;
95+
auto ip_address = asio::ip::make_address(dst_parts[0]);
9696
auto port = boost::lexical_cast<std::uint16_t>(dst_parts[1]);
9797
std::cout << "connecting to " << address << "\n";
9898
asio::ip::tcp::endpoint end_point(ip_address, port);

‎examples/stream-parse.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ int main(int argc, char **argv) {
113113
std::copy(&argv[2], &argv[argc], std::back_inserter(cmd_items));
114114

115115
// connect to redis
116-
asio::io_service io_service;
117-
auto ip_address = asio::ip::address::from_string(dst_parts[0]);
116+
asio::io_context io_service;
117+
auto ip_address = asio::ip::make_address(dst_parts[0]);
118118
auto port = boost::lexical_cast<std::uint16_t>(dst_parts[1]);
119119
std::cout << "connecting to " << address << "\n";
120120
asio::ip::tcp::endpoint end_point(ip_address, port);

‎examples/synch-subscription.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ int main(int argc, char **argv) {
111111

112112
try {
113113
// connect to redis
114-
asio::io_service io_service;
115-
auto ip_address = asio::ip::address::from_string(dst_parts[0]);
114+
asio::io_context io_service;
115+
auto ip_address = asio::ip::make_address(dst_parts[0]);
116116
auto port = boost::lexical_cast<std::uint16_t>(dst_parts[1]);
117117
std::cout << "connecting to " << address << "\n";
118118
asio::ip::tcp::endpoint end_point(ip_address, port);

‎include/bredis/impl/async_op.ipp

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -176,21 +176,14 @@ class async_read_op {
176176
return asio_handler_is_continuation(std::addressof(op->callback_));
177177
}
178178

179-
friend void *asio_handler_allocate(std::size_t size, async_read_op *op) {
180-
using boost::asio::asio_handler_allocate;
181-
return asio_handler_allocate(size, std::addressof(op->callback_));
179+
boost::asio::associated_allocator_t<ReadCallback> get_allocator() const noexcept
180+
{
181+
return boost::asio::get_associated_allocator(callback_);
182182
}
183183

184-
friend void asio_handler_deallocate(void *p, std::size_t size,
185-
async_read_op *op) {
186-
using boost::asio::asio_handler_deallocate;
187-
return asio_handler_deallocate(p, size, std::addressof(op->callback_));
188-
}
189-
190-
template <class Function>
191-
friend void asio_handler_invoke(Function &&f, async_read_op *op) {
192-
using boost::asio::asio_handler_invoke;
193-
return asio_handler_invoke(f, std::addressof(op->callback_));
184+
boost::asio::associated_executor_t<ReadCallback> get_executor() const noexcept
185+
{
186+
return boost::asio::get_associated_executor(callback_);
194187
}
195188
};
196189

‎t/05-protocol.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
namespace r = bredis;
1010
namespace asio = boost::asio;
1111

12-
using Buffer = asio::const_buffers_1;
12+
using Buffer = asio::const_buffer;
1313
using Iterator = boost::asio::buffers_iterator<Buffer, char>;
1414
using Policy = r::parsing_policy::keep_result;
1515
using positive_result_t = r::parse_result_mapper_t<Iterator, Policy>;

‎t/06-fragmented-buffer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace r = bredis;
1212
namespace asio = boost::asio;
1313

1414
TEST_CASE("right consumption", "[protocol]") {
15-
using Buffer = std::vector<asio::const_buffers_1>;
15+
using Buffer = std::vector<asio::const_buffer>;
1616
using Iterator = boost::asio::buffers_iterator<Buffer, char>;
1717
using Policy = r::parsing_policy::keep_result;
1818
using positive_result_t = r::parse_result_mapper_t<Iterator, Policy>;
@@ -22,7 +22,7 @@ TEST_CASE("right consumption", "[protocol]") {
2222

2323
Buffer buff;
2424
for (size_t i = 0; i < full_message.size(); i++) {
25-
asio::const_buffers_1 v(full_message.c_str() + i, 1);
25+
asio::const_buffer v(full_message.c_str() + i, 1);
2626
buff.push_back(v);
2727
}
2828
auto b_from = Iterator::begin(buff), b_to = Iterator::end(buff);

‎t/07-extract.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
namespace r = bredis;
99
namespace asio = boost::asio;
1010

11-
using Buffer = asio::const_buffers_1;
11+
using Buffer = asio::const_buffer;
1212
using Iterator = boost::asio::buffers_iterator<Buffer, char>;
1313

1414
TEST_CASE("string extraction", "[protocol]") {

‎t/10-ping.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ TEST_CASE("ping", "[connection]") {
3535
auto port_str = boost::lexical_cast<std::string>(port);
3636
auto server = ts::make_server({"redis-server", "--port", port_str});
3737
ep::wait_port<ep::Kind::TCP>(port);
38-
asio::io_service io_service;
38+
asio::io_context io_service;
3939

4040
asio::ip::tcp::endpoint end_point(
41-
asio::ip::address::from_string("127.0.0.1"), port);
41+
asio::ip::make_address("127.0.0.1"), port);
4242
socket_t socket(io_service, end_point.protocol());
4343
socket.connect(end_point);
4444

‎t/11-multi-ping.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ TEST_CASE("ping", "[connection]") {
4848
auto port_str = boost::lexical_cast<std::string>(port);
4949
auto server = ts::make_server({"redis-server", "--port", port_str});
5050
ep::wait_port<ep::Kind::TCP>(port);
51-
asio::io_service io_service;
51+
asio::io_context io_service;
5252

5353
asio::ip::tcp::endpoint end_point(
54-
asio::ip::address::from_string("127.0.0.1"), port);
54+
asio::ip::make_address("127.0.0.1"), port);
5555
socket_t socket(io_service, end_point.protocol());
5656
socket.connect(end_point);
5757

‎t/12-basic-types.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ TEST_CASE("ping", "[connection]") {
4242
auto port_str = boost::lexical_cast<std::string>(port);
4343
auto server = ts::make_server({"redis-server", "--port", port_str});
4444
ep::wait_port<ep::Kind::TCP>(port);
45-
asio::io_service io_service;
45+
asio::io_context io_service;
4646

4747
asio::ip::tcp::endpoint end_point(
48-
asio::ip::address::from_string("127.0.0.1"), port);
48+
asio::ip::make_address("127.0.0.1"), port);
4949
socket_t socket(io_service, end_point.protocol());
5050
socket.connect(end_point);
5151

‎t/13-protol-error.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ TEST_CASE("protocol-error", "[connection]") {
3333
std::chrono::milliseconds sleep_delay(1);
3434

3535
uint16_t port = ep::get_random<ep::Kind::TCP>();
36-
asio::io_service io_service;
36+
asio::io_context io_service;
3737
asio::ip::tcp::endpoint end_point(
38-
asio::ip::address::from_string("127.0.0.1"), port);
38+
asio::ip::make_address("127.0.0.1"), port);
3939
asio::ip::tcp::acceptor acceptor(io_service, end_point.protocol());
4040

4141
acceptor.bind(end_point);
@@ -45,7 +45,7 @@ TEST_CASE("protocol-error", "[connection]") {
4545
std::string data = "bla-bla";
4646
std::string end_marker = "ping\r\n";
4747
Buffer remote_rx_buff;
48-
asio::const_buffers_1 output_buf = asio::buffer(data.c_str(), data.size());
48+
asio::const_buffer output_buf = asio::buffer(data.c_str(), data.size());
4949
acceptor.async_accept(peer_socket, [&](const sys::error_code &error_code) {
5050
(void)error_code;
5151
BREDIS_LOG_DEBUG("async_accept: " << error_code.message() << ", "

‎t/14-uds.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ TEST_CASE("ping", "[connection]") {
6565
}
6666
r::command_wrapper_t cmd(ping_cmds_container);
6767

68-
asio::io_service io_service;
68+
asio::io_context io_service;
6969

7070
asio::local::stream_protocol::endpoint end_point(redis_socket);
7171
socket_t socket(io_service, end_point.protocol());

‎t/15-cancellation.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ TEST_CASE("cancel-on-read", "[cancellation]") {
3535
std::chrono::milliseconds sleep_delay(1);
3636

3737
uint16_t port = ep::get_random<ep::Kind::TCP>();
38-
asio::io_service io_service;
38+
asio::io_context io_service;
3939
asio::ip::tcp::endpoint end_point(
40-
asio::ip::address::from_string("127.0.0.1"), port);
40+
asio::ip::make_address("127.0.0.1"), port);
4141
asio::ip::tcp::acceptor acceptor(io_service, end_point.protocol());
4242

4343
acceptor.bind(end_point);

‎t/16-close-connection.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ TEST_CASE("close-afrer-read", "[connection]") {
3333
std::chrono::milliseconds sleep_delay(1);
3434

3535
uint16_t port = ep::get_random<ep::Kind::TCP>();
36-
asio::io_service io_service;
36+
asio::io_context io_service;
3737
asio::ip::tcp::endpoint end_point(
38-
asio::ip::address::from_string("127.0.0.1"), port);
38+
asio::ip::make_address("127.0.0.1"), port);
3939
asio::ip::tcp::acceptor acceptor(io_service, end_point.protocol());
4040

4141
acceptor.bind(end_point);
@@ -105,9 +105,9 @@ TEST_CASE("close-before-write", "[connection]") {
105105
std::chrono::milliseconds sleep_delay(1);
106106

107107
uint16_t port = ep::get_random<ep::Kind::TCP>();
108-
asio::io_service io_service;
108+
asio::io_context io_service;
109109
asio::ip::tcp::endpoint end_point(
110-
asio::ip::address::from_string("127.0.0.1"), port);
110+
asio::ip::make_address("127.0.0.1"), port);
111111
asio::ip::tcp::acceptor acceptor(io_service, end_point.protocol());
112112

113113
acceptor.bind(end_point);

‎t/17-sync.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ TEST_CASE("ping", "[connection]") {
3131
auto port_str = boost::lexical_cast<std::string>(port);
3232
auto server = ts::make_server({"redis-server", "--port", port_str});
3333
ep::wait_port<ep::Kind::TCP>(port);
34-
asio::io_service io_service;
34+
asio::io_context io_service;
3535

3636
asio::ip::tcp::endpoint end_point(
37-
asio::ip::address::from_string("127.0.0.1"), port);
37+
asio::ip::make_address("127.0.0.1"), port);
3838
socket_t socket(io_service, end_point.protocol());
3939
socket.connect(end_point);
4040

‎t/18-subscription.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ TEST_CASE("subscription", "[connection]") {
4141
auto server = ts::make_server({"redis-server", "--port", port_str});
4242
ep::wait_port<ep::Kind::TCP>(port);
4343
// uint16_t port = 6379;
44-
asio::io_service io_service;
44+
asio::io_context io_service;
4545

4646
asio::ip::tcp::endpoint end_point(
47-
asio::ip::address::from_string("127.0.0.1"), port);
47+
asio::ip::make_address("127.0.0.1"), port);
4848
socket_t socket(io_service, end_point.protocol());
4949
socket.connect(end_point);
5050

‎t/19-transaction.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ TEST_CASE("transaction", "[connection]") {
4040
auto port_str = boost::lexical_cast<std::string>(port);
4141
auto server = ts::make_server({"redis-server", "--port", port_str});
4242
ep::wait_port<ep::Kind::TCP>(port);
43-
asio::io_service io_service;
43+
asio::io_context io_service;
4444

4545
r::command_container_t tx_commands = {
4646
r::single_command_t("MULTI"),
@@ -54,7 +54,7 @@ TEST_CASE("transaction", "[connection]") {
5454
std::future<result_t> completion_future = completion_promise.get_future();
5555

5656
asio::ip::tcp::endpoint end_point(
57-
asio::ip::address::from_string("127.0.0.1"), port);
57+
asio::ip::make_address("127.0.0.1"), port);
5858
socket_t socket(io_service, end_point.protocol());
5959
socket.connect(end_point);
6060
r::Connection<next_layer_t> c(std::move(socket));

‎t/20-promise.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ TEST_CASE("ping", "[connection]") {
3333
auto port_str = boost::lexical_cast<std::string>(port);
3434
auto server = ts::make_server({"redis-server", "--port", port_str});
3535
ep::wait_port<ep::Kind::TCP>(port);
36-
asio::io_service io_service;
36+
asio::io_context io_service;
3737

3838
asio::ip::tcp::endpoint end_point(
39-
asio::ip::address::from_string("127.0.0.1"), port);
39+
asio::ip::make_address("127.0.0.1"), port);
4040
socket_t socket(io_service, end_point.protocol());
4141
socket.connect(end_point);
4242

‎t/21-coroutine.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ TEST_CASE("ping", "[connection]") {
3333
auto port_str = boost::lexical_cast<std::string>(port);
3434
auto server = ts::make_server({"redis-server", "--port", port_str});
3535
ep::wait_port<ep::Kind::TCP>(port);
36-
asio::io_service io_service;
36+
asio::io_context io_service;
3737

3838
asio::ip::tcp::endpoint end_point(
39-
asio::ip::address::from_string("127.0.0.1"), port);
39+
asio::ip::make_address("127.0.0.1"), port);
4040
socket_t socket(io_service, end_point.protocol());
4141
socket.connect(end_point);
4242

‎t/22-ping_drop-policy.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ TEST_CASE("ping/drop-policy", "[connection]") {
5050
auto port_str = boost::lexical_cast<std::string>(port);
5151
auto server = ts::make_server({"redis-server", "--port", port_str});
5252
ep::wait_port<ep::Kind::TCP>(port);
53-
asio::io_service io_service;
53+
asio::io_context io_service;
5454

5555
asio::ip::tcp::endpoint end_point(
56-
asio::ip::address::from_string("127.0.0.1"), port);
56+
asio::ip::make_address("127.0.0.1"), port);
5757
socket_t socket(io_service, end_point.protocol());
5858
socket.connect(end_point);
5959

‎t/23-stream.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ TEST_CASE("stream", "[connection]") {
3535
auto port_str = boost::lexical_cast<std::string>(port);
3636
auto server = ts::make_server({"redis-server", "--port", port_str});
3737
ep::wait_port<ep::Kind::TCP>(port);
38-
asio::io_service io_service;
38+
asio::io_context io_service;
3939

4040
asio::ip::tcp::endpoint end_point(
41-
asio::ip::address::from_string("127.0.0.1"), port);
41+
asio::ip::make_address("127.0.0.1"), port);
4242
socket_t socket(io_service, end_point.protocol());
4343
socket.connect(end_point);
4444

‎t/24-dynbuff.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ TEST_CASE("ping", "[connection]") {
5252
auto port_str = boost::lexical_cast<std::string>(port);
5353
auto server = ts::make_server({"redis-server", "--port", port_str});
5454
ep::wait_port<ep::Kind::TCP>(port);
55-
asio::io_service io_service;
55+
asio::io_context io_service;
5656

5757
asio::ip::tcp::endpoint end_point(
58-
asio::ip::address::from_string("127.0.0.1"), port);
58+
asio::ip::make_address("127.0.0.1"), port);
5959
socket_t socket(io_service, end_point.protocol());
6060
socket.connect(end_point);
6161

‎t/SocketWithLogging.hpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,10 @@ class SocketWithLogging {
4545
template <typename BufferSequence>
4646
static void dump(const char *prefix, const BufferSequence &buffers,
4747
std::size_t size) {
48-
using boost::asio::buffer_cast;
49-
using boost::asio::buffer_size;
50-
5148
std::string content;
5249
content.reserve(size);
5350
for (auto const &buffer : buffers) {
54-
content.append(buffer_cast<char const *>(buffer),
55-
buffer_size(buffer));
51+
content.append(buffer.data(), buffer.size());
5652
}
5753
LogPolicy::log(prefix, content);
5854
}

0 commit comments

Comments
 (0)