Fix min/max on MSVC

fix #1578

CHANGELOG.md

@@ -2,6 +2,7 @@ Version 253:
 
 * Fix async_detect_ssl handler type
 * member get_executor const-correctness
+* Fix min/max on MSVC
 
 --------------------------------------------------------------------------------
 

include/boost/beast/core/detail/type_traits.hpp

@@ -25,21 +25,6 @@ namespace boost {
 namespace beast {
 namespace detail {
 
-// variadic min
-template<class T>
-T constexpr min(T t)
-{
-    return t;
-}
-
-template<class T, class...Tn>
-T constexpr min(T t0, T t1, Tn... tn)
-{
-    return (t0 < t1) ?
-        (detail::min)(t0, tn...) :
-        (detail::min)(t1, tn...);
-}
-
 template<class U>
 std::size_t constexpr
 max_sizeof()

include/boost/beast/core/rate_policy.hpp

@@ -152,7 +152,7 @@ class simple_rate_policy
     friend class rate_policy_access;
 
     static std::size_t constexpr all =
-        std::numeric_limits<std::size_t>::max();
+        (std::numeric_limits<std::size_t>::max)();
 
     std::size_t rd_remain_ = all;
     std::size_t wr_remain_ = all;

include/boost/beast/websocket/detail/prng.hpp

@@ -11,6 +11,7 @@
 #define BOOST_BEAST_WEBSOCKET_DETAIL_PRNG_HPP
 
 #include <boost/beast/core/detail/config.hpp>
+#include <boost/config.hpp>
 #include <cstdint>
 #include <limits>
 #include <random>
@@ -65,7 +66,7 @@ public:
 
         static
         value_type constexpr
-        min() noexcept
+        min BOOST_PREVENT_MACRO_SUBSTITUTION () noexcept
         {
             return (std::numeric_limits<
                 value_type>::min)();
@@ -73,7 +74,7 @@ public:
 
         static
         value_type constexpr
-        max() noexcept
+        max BOOST_PREVENT_MACRO_SUBSTITUTION () noexcept
         {
             return (std::numeric_limits<
                 value_type>::max)();

test/beast/core.cpp

@@ -7,5 +7,12 @@
 // Official repository: https://github.com/boostorg/beast
 //
 
+// If including Windows.h generates errors, it
+// means that min/max macros are being substituted.
+#ifdef _MSC_VER
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+#endif
+
 // Test that header file is self-contained.
 #include <boost/beast/core.hpp>

test/beast/http.cpp

@@ -7,5 +7,12 @@
 // Official repository: https://github.com/boostorg/beast
 //
 
+// If including Windows.h generates errors, it
+// means that min/max macros are being substituted.
+#ifdef _MSC_VER
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+#endif
+
 // Test that header file is self-contained.
 #include <boost/beast/http.hpp>

test/beast/ssl.cpp

@@ -7,5 +7,12 @@
 // Official repository: https://github.com/boostorg/beast
 //
 
+// If including Windows.h generates errors, it
+// means that min/max macros are being substituted.
+#ifdef _MSC_VER
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+#endif
+
 // Test that header file is self-contained.
 #include <boost/beast/ssl.hpp>

test/beast/version.cpp

@@ -7,5 +7,12 @@
 // Official repository: https://github.com/boostorg/beast
 //
 
+// If including Windows.h generates errors, it
+// means that min/max macros are being substituted.
+#ifdef _MSC_VER
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+#endif
+
 // Test that header file is self-contained.
 #include <boost/beast/version.hpp>

test/beast/websocket.cpp

@@ -7,5 +7,12 @@
 // Official repository: https://github.com/boostorg/beast
 //
 
+// If including Windows.h generates errors, it
+// means that min/max macros are being substituted.
+#ifdef _MSC_VER
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+#endif
+
 // Test that header file is self-contained.
 #include <boost/beast/websocket.hpp>

test/beast/zlib.cpp

@@ -7,5 +7,12 @@
 // Official repository: https://github.com/boostorg/beast
 //
 
+// If including Windows.h generates errors, it
+// means that min/max macros are being substituted.
+#ifdef _MSC_VER
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+#endif
+
 // Test that header file is self-contained.
 #include <boost/beast/zlib.hpp>