diff options
| author | Hugo Drumond Jacob <hugojacob@google.com> | 2023-09-21 20:21:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-09-21 20:21:12 +0000 |
| commit | cdcb9f2c8e04a45209b9d72210d28401e5f271e9 (patch) | |
| tree | 36827362bdef344d61b6e2f2c77c1f845684a9f1 | |
| parent | bb8d3d78459d551284060be807cb4914ad99d6b0 (diff) | |
| parent | e868074b504db8ab09acefb91b0f37592c64be88 (diff) | |
| download | vsomeip-cdcb9f2c8e04a45209b9d72210d28401e5f271e9.tar.gz | |
Use Boost 1.76.0 am: d10a4d71cd am: 25641ff28a am: 888bde4fe4 am: e868074b50
Original change: https://android-review.googlesource.com/c/platform/external/sdv/vsomeip/+/2757425
Change-Id: I68a52a88c368dc8a45afdb0bcc62f6858150d981
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
3 files changed, 8 insertions, 8 deletions
@@ -27,12 +27,12 @@ cc_defaults { name: "vsomeip_defaults", header_libs: [ - "libboost_headers", + "libboost_library_headers", ], local_include_dirs: [ "interface", - "implementation/helper/1.70", + "implementation/helper/1.76", ], rtti: true, @@ -73,7 +73,7 @@ cc_library_shared { local_include_dirs: [ "interface", - "implementation/helper/1.70" + "implementation/helper/1.76" ], export_include_dirs: [ @@ -106,7 +106,7 @@ cc_library_shared { local_include_dirs: [ "interface", - "implementation/helper/1.70" + "implementation/helper/1.76" ], shared_libs: [ @@ -130,7 +130,7 @@ cc_library_shared { local_include_dirs: [ "interface", - "implementation/helper/1.70" + "implementation/helper/1.76" ], shared_libs: [ @@ -153,7 +153,7 @@ cc_library_shared { local_include_dirs: [ "interface", - "implementation/helper/1.70" + "implementation/helper/1.76" ], shared_libs: [ diff --git a/implementation/helper/1.76/boost/asio/detail/reactive_socket_recvfrom_op_ext_local.hpp b/implementation/helper/1.76/boost/asio/detail/reactive_socket_recvfrom_op_ext_local.hpp index f9fef2b8..120b1eb1 100644 --- a/implementation/helper/1.76/boost/asio/detail/reactive_socket_recvfrom_op_ext_local.hpp +++ b/implementation/helper/1.76/boost/asio/detail/reactive_socket_recvfrom_op_ext_local.hpp @@ -37,7 +37,7 @@ public: reactive_socket_recvfrom_op_base_ext_local(socket_type socket, int protocol_type, const MutableBufferSequence& buffers, Endpoint& endpoint, socket_base::message_flags flags, func_type complete_func) - : reactor_op_ext_local(&reactive_socket_recvfrom_op_base_ext_local::do_perform, complete_func), + : reactor_op_ext_local(boost::system::error_code(), &reactive_socket_recvfrom_op_base_ext_local::do_perform, complete_func), socket_(socket), protocol_type_(protocol_type), buffers_(buffers), diff --git a/implementation/helper/1.76/boost/asio/detail/reactive_socket_recvmsg_op_ext.hpp b/implementation/helper/1.76/boost/asio/detail/reactive_socket_recvmsg_op_ext.hpp index bd315dcf..b55186bb 100644 --- a/implementation/helper/1.76/boost/asio/detail/reactive_socket_recvmsg_op_ext.hpp +++ b/implementation/helper/1.76/boost/asio/detail/reactive_socket_recvmsg_op_ext.hpp @@ -41,7 +41,7 @@ public: reactive_socket_recvmsg_op_base_ext(const boost::system::error_code& success_ec, socket_type socket, const MutableBufferSequence& buffers, socket_base::message_flags in_flags, socket_base::message_flags& out_flags, func_type complete_func) - : reactor_op_ext(&reactive_socket_recvmsg_op_base_ext::do_perform, complete_func), + : reactor_op_ext(success_ec, &reactive_socket_recvmsg_op_base_ext::do_perform, complete_func), socket_(socket), buffers_(buffers), in_flags_(in_flags), |