From 321cbd5909ee7bec1792ec472e3673917a8dfb8b Mon Sep 17 00:00:00 2001 From: dario Date: Fri, 3 Oct 2025 12:57:25 -0600 Subject: [PATCH 1/2] setTimeout now accepts non-const references --- include/serial_cpp/impl/unix.h | 2 +- include/serial_cpp/impl/win.h | 2 +- include/serial_cpp/serial.h | 2 +- src/impl/unix.cc | 2 +- src/impl/win.cc | 2 +- src/serial.cc | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/serial_cpp/impl/unix.h b/include/serial_cpp/impl/unix.h index 5a33575..d3051ed 100644 --- a/include/serial_cpp/impl/unix.h +++ b/include/serial_cpp/impl/unix.h @@ -141,7 +141,7 @@ class serial_cpp::Serial::SerialImpl { getPort () const; void - setTimeout (Timeout &timeout); + setTimeout (const Timeout &timeout); Timeout getTimeout () const; diff --git a/include/serial_cpp/impl/win.h b/include/serial_cpp/impl/win.h index 6d2ca04..9c12213 100644 --- a/include/serial_cpp/impl/win.h +++ b/include/serial_cpp/impl/win.h @@ -130,7 +130,7 @@ class serial_cpp::Serial::SerialImpl { getPort () const; void - setTimeout (Timeout &timeout); + setTimeout (const Timeout &timeout); Timeout getTimeout () const; diff --git a/include/serial_cpp/serial.h b/include/serial_cpp/serial.h index 8363972..08663e9 100644 --- a/include/serial_cpp/serial.h +++ b/include/serial_cpp/serial.h @@ -458,7 +458,7 @@ class Serial { * \see serial_cpp::Timeout */ void - setTimeout (Timeout &timeout); + setTimeout (const Timeout &timeout); /*! Sets the timeout for reads and writes. */ void diff --git a/src/impl/unix.cc b/src/impl/unix.cc index 0f415f5..236e80f 100755 --- a/src/impl/unix.cc +++ b/src/impl/unix.cc @@ -725,7 +725,7 @@ Serial::SerialImpl::getPort () const } void -Serial::SerialImpl::setTimeout (serial_cpp::Timeout &timeout) +Serial::SerialImpl::setTimeout (const serial_cpp::Timeout &timeout) { timeout_ = timeout; } diff --git a/src/impl/win.cc b/src/impl/win.cc index 79fd4de..7e158ab 100644 --- a/src/impl/win.cc +++ b/src/impl/win.cc @@ -370,7 +370,7 @@ Serial::SerialImpl::getPort () const } void -Serial::SerialImpl::setTimeout (serial_cpp::Timeout &timeout) +Serial::SerialImpl::setTimeout (const serial_cpp::Timeout &timeout) { timeout_ = timeout; if (is_open_) { diff --git a/src/serial.cc b/src/serial.cc index 9226899..c207729 100755 --- a/src/serial.cc +++ b/src/serial.cc @@ -297,7 +297,7 @@ Serial::getPort () const } void -Serial::setTimeout (serial_cpp::Timeout &timeout) +Serial::setTimeout (const serial_cpp::Timeout &timeout) { pimpl_->setTimeout (timeout); } From e2b8dfbfb0b69ffd464c70ef800e1b72a623b60b Mon Sep 17 00:00:00 2001 From: Carlos4621 Date: Fri, 3 Oct 2025 15:47:20 -0600 Subject: [PATCH 2/2] Modify the Serial constructor to accept a Timeout constant reference --- include/serial_cpp/serial.h | 2 +- src/serial.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/serial_cpp/serial.h b/include/serial_cpp/serial.h index 08663e9..890453e 100644 --- a/include/serial_cpp/serial.h +++ b/include/serial_cpp/serial.h @@ -179,7 +179,7 @@ class Serial { */ Serial (const std::string &port = "", uint32_t baudrate = 9600, - Timeout timeout = Timeout(), + const Timeout& timeout = Timeout(), bytesize_t bytesize = eightbits, parity_t parity = parity_none, stopbits_t stopbits = stopbits_one, diff --git a/src/serial.cc b/src/serial.cc index c207729..38bc7f3 100755 --- a/src/serial.cc +++ b/src/serial.cc @@ -63,7 +63,7 @@ class Serial::ScopedWriteLock { SerialImpl *pimpl_; }; -Serial::Serial (const string &port, uint32_t baudrate, serial_cpp::Timeout timeout, +Serial::Serial (const string &port, uint32_t baudrate, const serial_cpp::Timeout& timeout, bytesize_t bytesize, parity_t parity, stopbits_t stopbits, flowcontrol_t flowcontrol) : pimpl_(new SerialImpl (port, baudrate, bytesize, parity,