Use std::min replace min

KangLin · Jul 22, 2024 · dfedea8 · dfedea8
1 parent 086f17c
commit dfedea8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/common/rdr/HexInStream.cxx b/common/rdr/HexInStream.cxx
@@ -20,13 +20,12 @@
 #include <rdr/HexInStream.h>
 #include <rdr/Exception.h>
 #include <rfb/util.h>
+#include <algorithm>
 
 using namespace rdr;
 
 #undef min
 
-static inline int min(int a, int b) {return a<b ? a : b;}
-
 HexInStream::HexInStream(InStream& is)
 : in_stream(is)
 {
@@ -40,7 +39,7 @@ bool HexInStream::fillBuffer() {
   if (!in_stream.hasData(2))
     return false;
 
-  size_t length = min(in_stream.avail()/2, availSpace());
+  size_t length = std::min((int64_t)ptr-sentUpTo, (int64_t)out_stream.avail()/2);
   const uint8_t* iptr = in_stream.getptr(length*2);
 
   uint8_t* optr = (uint8_t*) end;

diff --git a/common/rdr/HexOutStream.cxx b/common/rdr/HexOutStream.cxx
@@ -23,13 +23,10 @@
 
 #include <rdr/HexOutStream.h>
 #include <rfb/util.h>
+#include <algorithm>
 
 using namespace rdr;
 
-#ifndef WIN32
-static inline size_t min(size_t a, size_t b) {return a<b ? a : b;}
-#endif
-
 HexOutStream::HexOutStream(OutStream& os)
   : out_stream(os)
 {
@@ -43,7 +40,7 @@ bool HexOutStream::flushBuffer()
 {
   while (sentUpTo != ptr) {
     uint8_t* optr = out_stream.getptr(2);
-    size_t length = min(ptr-sentUpTo, out_stream.avail()/2);
+    size_t length = std::min(ptr-sentUpTo, out_stream.avail()/2);
 
     for (size_t i=0; i<length; i++)
       rfb::binToHex(&sentUpTo[i], 1, (char*)&optr[i*2], 2);