Merge branch 'develop'

More max that needs guarding from Windows header macros
2026-02-03 09:02:12 +00:00 · 2018-11-28 20:06:50 -05:00 · 2018-11-28 20:06:31 -05:00
1 changed files with 2 additions and 2 deletions
--- a/include/boost/circular_buffer/allocators.hpp
+++ b/include/boost/circular_buffer/allocators.hpp
@@ -35,7 +35,7 @@ struct allocator_traits
    using typename std::allocator_traits<A>::size_type;

    static size_type max_size(const A&) BOOST_NOEXCEPT {
-        return std::numeric_limits<size_type>::max() / sizeof(value_type);
+        return (std::numeric_limits<size_type>::max)() / sizeof(value_type);
    }
 };
 #else
@@ -48,7 +48,7 @@ struct allocator_traits {
    typedef typename A::size_type size_type;

    static size_type max_size(const A&) BOOST_NOEXCEPT {
-        return std::numeric_limits<size_type>::max() / sizeof(value_type);
+        return (std::numeric_limits<size_type>::max)() / sizeof(value_type);
    }

 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
Author	SHA1	Message	Date
Glen Fernandes	3dc0e1c56b	Merge branch 'develop'	2018-11-28 20:06:50 -05:00
Glen Fernandes	b07fbd056a	More max that needs guarding from Windows header macros	2018-11-28 20:06:31 -05:00