[rtems-tools commit] record: Fix use of std::min

Sebastian Huber sebh at rtems.org
Tue Sep 10 10:50:09 UTC 2019


Module:    rtems-tools
Branch:    master
Commit:    12bd8f77bad4779319039fd7be33d006e10f5618
Changeset: http://git.rtems.org/rtems-tools/commit/?id=12bd8f77bad4779319039fd7be33d006e10f5618

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Tue Sep 10 12:10:23 2019 +0200

record: Fix use of std::min

Update #3665.

---

 trace/record/record-client-base.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/trace/record/record-client-base.cc b/trace/record/record-client-base.cc
index ac88eab..8fe6edb 100644
--- a/trace/record/record-client-base.cc
+++ b/trace/record/record-client-base.cc
@@ -40,6 +40,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 
+#include <algorithm>
 #include <cassert>
 #include <cstring>
 
@@ -108,7 +109,7 @@ void Client::Run() {
 
   while (stop_ == 0 && todo > 0) {
     int buf[8192];
-    size_t m = std::min(sizeof(buf), todo);
+    size_t m = std::min(static_cast<uint64_t>(sizeof(buf)), todo);
     ssize_t n = input_.Read(buf, m);
     if (n <= 0) {
       break;




More information about the vc mailing list