1From 2e4cf095afdcf843e93d1bdea9dbd961558f09bd Mon Sep 17 00:00:00 2001 2From: Fabrice Fontaine <fontaine.fabrice@gmail.com> 3Date: Sun, 13 Jan 2019 21:01:19 +0100 4Subject: [PATCH] SerialPort.cpp: fix build when size_t is an unsigned int 5 6size_t can be defined as an unsigned int instead of long unsigned int so 7replace 1UL to (size_t)1 when calling max function 8 9Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 10[Upstream status: https://github.com/crayzeewulf/libserial/pull/126] 11--- 12 src/SerialPort.cpp | 4 ++-- 13 1 file changed, 2 insertions(+), 2 deletions(-) 14 15diff --git a/src/SerialPort.cpp b/src/SerialPort.cpp 16index e354fcb..75e762e 100644 17--- a/src/SerialPort.cpp 18+++ b/src/SerialPort.cpp 19@@ -2208,7 +2208,7 @@ namespace LibSerial 20 21 // Local variables. 22 size_t number_of_bytes_read = 0 ; 23- size_t number_of_bytes_remaining = std::max(numberOfBytes, 1UL) ; 24+ size_t number_of_bytes_remaining = std::max(numberOfBytes, (size_t)1) ; 25 size_t maximum_number_of_bytes = dataBuffer.max_size() ; 26 27 // Clear the data buffer and reserve enough space in the buffer to store the incoming data. 28@@ -2302,7 +2302,7 @@ namespace LibSerial 29 30 // Local variables. 31 size_t number_of_bytes_read = 0 ; 32- size_t number_of_bytes_remaining = std::max(numberOfBytes, 1UL) ; 33+ size_t number_of_bytes_remaining = std::max(numberOfBytes, (size_t)1) ; 34 size_t maximum_number_of_bytes = dataString.max_size() ; 35 36 // Clear the data buffer and reserve enough space in the buffer to store the incoming data. 37-- 382.14.1 39 40