From ff2aa8f08b117f2a309ed49cf68b135f930093f8 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Thu, 18 Nov 2021 11:15:29 -0500 Subject: [PATCH] Fix: pass explicit type to std::min for 32-bit platforms MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Provide an explicit type to templates when comparing a 'uint64_t' with a type that is less than 64-bits on 32-bit platforms. main.cpp: In function ‘relay_connection_status relay_process_data_receive_payload(relay_connection*)’: main.cpp:3632:44: error: no matching function for call to ‘min(uint64_t&, const size_t&)’ 3632 | size_t recv_size = std::min(left_to_receive, chunk_size); | ~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Change-Id: I8fe8725c5c888cce9c54d564bd668e9723c0f947 Signed-off-by: Michael Jeanson Signed-off-by: Jérémie Galarneau --- src/bin/lttng-relayd/main.cpp | 2 +- src/bin/lttng-relayd/stream.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/lttng-relayd/main.cpp b/src/bin/lttng-relayd/main.cpp index 4b7726d4e..1da83086e 100644 --- a/src/bin/lttng-relayd/main.cpp +++ b/src/bin/lttng-relayd/main.cpp @@ -3629,7 +3629,7 @@ static enum relay_connection_status relay_process_data_receive_payload( * - the on-stack data buffer */ while (left_to_receive > 0 && !partial_recv) { - size_t recv_size = std::min(left_to_receive, chunk_size); + size_t recv_size = std::min(left_to_receive, chunk_size); struct lttng_buffer_view packet_chunk; ret = conn->sock->ops->recvmsg(conn->sock, data_buffer, diff --git a/src/bin/lttng-relayd/stream.cpp b/src/bin/lttng-relayd/stream.cpp index 158009295..346936d84 100644 --- a/src/bin/lttng-relayd/stream.cpp +++ b/src/bin/lttng-relayd/stream.cpp @@ -261,7 +261,7 @@ static int rotate_truncate_stream(struct relay_stream *stream) while (copy_bytes_left) { ssize_t io_ret; char copy_buffer[FILE_IO_STACK_BUFFER_SIZE]; - const off_t copy_size_this_pass = std::min(copy_bytes_left, sizeof(copy_buffer)); + const off_t copy_size_this_pass = std::min(copy_bytes_left, sizeof(copy_buffer)); io_ret = fs_handle_read(previous_stream_file, copy_buffer, copy_size_this_pass); -- 2.34.1