From 8dca051077783c6be939632c9cb021aae8f3b8c5 Mon Sep 17 00:00:00 2001 From: Kang Lin Date: Thu, 25 Jul 2024 11:32:48 +0800 Subject: [PATCH] Use std::min replace min --- common/rdr/HexInStream.cxx | 12 +++++++----- common/rdr/HexOutStream.cxx | 11 ++++++----- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/common/rdr/HexInStream.cxx b/common/rdr/HexInStream.cxx index e23974e198..54d4deb12b 100644 --- a/common/rdr/HexInStream.cxx +++ b/common/rdr/HexInStream.cxx @@ -21,13 +21,16 @@ #include #endif +#include #include #include #include -using namespace rdr; +#if defined(_MSC_VER) +#undef min +#endif -static inline int min(int a, int b) {return a #endif - +#include #include #include -using namespace rdr; +#if defined(_MSC_VER) +#undef min +#endif -static inline size_t min(size_t a, size_t b) {return a