Merge pull request #45 from amensel/asio-no-deprecated

Looks good so far! Thank you for your contribution, I'll make a new release soon.

Author: basiliscos

CMakeLists.txt

@@ -10,6 +10,7 @@ enable_testing()
 
 add_definitions(-DBOOST_ERROR_CODE_HEADER_ONLY)
 add_definitions(-DBOOST_COROUTINES_NO_DEPRECATION_WARNING)
+add_definitions(-DBOOST_ASIO_NO_DEPRECATED)
 #add_definitions(-DBREDIS_DEBUG)
 
 find_package(

README.md

@@ -165,7 +165,7 @@ using Iterator = typename r::to_iterator<Buffer>::iterator_t;
 ...
 /* establishing connection to redis is outside of bredis */
 asio::ip::tcp::endpoint end_point(
-    asio::ip::address::from_string("127.0.0.1"), port);
+    asio::ip::make_address("127.0.0.1"), port);
 socket_t socket(io_service, end_point.protocol());
 socket.connect(end_point);
 
@@ -234,7 +234,7 @@ using result_t = r::parse_result_mapper_t<Iterator, Policy>;
 ...
 /* establishing the connection to redis is outside of bredis */
 asio::ip::tcp::endpoint end_point(
-    asio::ip::address::from_string("127.0.0.1"), port);
+    asio::ip::make_address("127.0.0.1"), port);
 socket_t socket(io_service, end_point.protocol());
 socket.connect(end_point);
 ...
@@ -467,7 +467,7 @@ outside of the bredis connection.
 using socket_t = asio::ip::tcp::socket;
 using next_layer_t = socket_t &;
 ...
-asio::ip::tcp::endpoint end_point(asio::ip::address::from_string("127.0.0.1"), port);
+asio::ip::tcp::endpoint end_point(asio::ip::make_address("127.0.0.1"), port);
 socket_t socket(io_service, end_point.protocol());
 socket.connect(end_point);
 r::Connection<next_layer_t> c(socket);

examples/multi-threads-1.cpp

@@ -138,8 +138,8 @@ int main(int argc, char **argv) {
     uint16_t port = vm.count("host") ? vm["port"].as<std::uint16_t>() : 6379;
 
     asio::io_context io;
-    //asio::io_service io_service;
-    auto ip_address = asio::ip::address::from_string(host);
+    //asio::io_context io_service;
+    auto ip_address = asio::ip::make_address(host);
     std::cout << "connecting to " << host << ":" << port << "\n";
     asio::ip::tcp::endpoint end_point(ip_address, port);
     socket_t socket(io, end_point.protocol());

examples/speed_test_async_multi.cpp

@@ -91,8 +91,8 @@ int main(int argc, char **argv) {
 
     r::command_wrapper_t cmd_wpapper{std::move(cmd_container)};
 
-    asio::io_service io_service;
-    auto ip_address = asio::ip::address::from_string(dst_parts[0]);
+    asio::io_context io_service;
+    auto ip_address = asio::ip::make_address(dst_parts[0]);
     auto port = boost::lexical_cast<std::uint16_t>(dst_parts[1]);
     std::cout << "connecting to " << address << "\n";
     asio::ip::tcp::endpoint end_point(ip_address, port);

examples/stream-parse.cpp

@@ -113,8 +113,8 @@ int main(int argc, char **argv) {
     std::copy(&argv[2], &argv[argc], std::back_inserter(cmd_items));
 
     // connect to redis
-    asio::io_service io_service;
-    auto ip_address = asio::ip::address::from_string(dst_parts[0]);
+    asio::io_context io_service;
+    auto ip_address = asio::ip::make_address(dst_parts[0]);
     auto port = boost::lexical_cast<std::uint16_t>(dst_parts[1]);
     std::cout << "connecting to " << address << "\n";
     asio::ip::tcp::endpoint end_point(ip_address, port);

examples/synch-subscription.cpp

@@ -111,8 +111,8 @@ int main(int argc, char **argv) {
 
     try {
         // connect to redis
-        asio::io_service io_service;
-        auto ip_address = asio::ip::address::from_string(dst_parts[0]);
+        asio::io_context io_service;
+        auto ip_address = asio::ip::make_address(dst_parts[0]);
         auto port = boost::lexical_cast<std::uint16_t>(dst_parts[1]);
         std::cout << "connecting to " << address << "\n";
         asio::ip::tcp::endpoint end_point(ip_address, port);

include/bredis/impl/async_op.ipp

@@ -176,21 +176,14 @@ class async_read_op {
         return asio_handler_is_continuation(std::addressof(op->callback_));
     }
 
-    friend void *asio_handler_allocate(std::size_t size, async_read_op *op) {
-        using boost::asio::asio_handler_allocate;
-        return asio_handler_allocate(size, std::addressof(op->callback_));
+    boost::asio::associated_allocator_t<ReadCallback> get_allocator() const noexcept
+    {
+        return boost::asio::get_associated_allocator(callback_);
     }
 
-    friend void asio_handler_deallocate(void *p, std::size_t size,
-                                        async_read_op *op) {
-        using boost::asio::asio_handler_deallocate;
-        return asio_handler_deallocate(p, size, std::addressof(op->callback_));
-    }
-
-    template <class Function>
-    friend void asio_handler_invoke(Function &&f, async_read_op *op) {
-        using boost::asio::asio_handler_invoke;
-        return asio_handler_invoke(f, std::addressof(op->callback_));
+    boost::asio::associated_executor_t<ReadCallback> get_executor() const noexcept
+    {
+        return boost::asio::get_associated_executor(callback_);
     }
 };
 

t/05-protocol.cpp

@@ -9,7 +9,7 @@
 namespace r = bredis;
 namespace asio = boost::asio;
 
-using Buffer = asio::const_buffers_1;
+using Buffer = asio::const_buffer;
 using Iterator = boost::asio::buffers_iterator<Buffer, char>;
 using Policy = r::parsing_policy::keep_result;
 using positive_result_t = r::parse_result_mapper_t<Iterator, Policy>;

t/06-fragmented-buffer.cpp

@@ -12,7 +12,7 @@ namespace r = bredis;
 namespace asio = boost::asio;
 
 TEST_CASE("right consumption", "[protocol]") {
-    using Buffer = std::vector<asio::const_buffers_1>;
+    using Buffer = std::vector<asio::const_buffer>;
     using Iterator = boost::asio::buffers_iterator<Buffer, char>;
     using Policy = r::parsing_policy::keep_result;
     using positive_result_t = r::parse_result_mapper_t<Iterator, Policy>;
@@ -22,7 +22,7 @@ TEST_CASE("right consumption", "[protocol]") {
 
     Buffer buff;
     for (size_t i = 0; i < full_message.size(); i++) {
-        asio::const_buffers_1 v(full_message.c_str() + i, 1);
+        asio::const_buffer v(full_message.c_str() + i, 1);
         buff.push_back(v);
     }
     auto b_from = Iterator::begin(buff), b_to = Iterator::end(buff);

t/07-extract.cpp

@@ -8,7 +8,7 @@
 namespace r = bredis;
 namespace asio = boost::asio;
 
-using Buffer = asio::const_buffers_1;
+using Buffer = asio::const_buffer;
 using Iterator = boost::asio::buffers_iterator<Buffer, char>;
 
 TEST_CASE("string extraction", "[protocol]") {