diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml index be8e5c5..0afb474 100644 --- a/.github/workflows/ci-windows.yml +++ b/.github/workflows/ci-windows.yml @@ -40,7 +40,7 @@ jobs: runs-on: ${{ matrix.os }} env: - CXXFLAGS: ${{ matrix.cxxflags }} /D_WIN32_WINNT=0x0601 /DWIN32_LEAN_AND_MEAN=1 /DNOMINMAX=1 /D_FILE_OFFSET_BITS=64 /DBOOST_ALL_NO_LIB /EHsc /bigobj + CXXFLAGS: ${{ matrix.cxxflags }} /D_WIN32_WINNT=0x0A00 /DWIN32_LEAN_AND_MEAN=1 /D_FILE_OFFSET_BITS=64 /DBOOST_ALL_NO_LIB /EHsc /bigobj LDFLAGS: ${{ matrix.ldflags }} CMAKE_BUILD_PARALLEL_LEVEL: 4 @@ -164,7 +164,7 @@ jobs: runs-on: ${{ matrix.os }} env: - CXXFLAGS: ${{ matrix.cxxflags }} /D_WIN32_WINNT=0x0601 /DWIN32_LEAN_AND_MEAN=1 /DNOMINMAX=1 /D_FILE_OFFSET_BITS=64 /DBOOST_ALL_NO_LIB /EHsc /bigobj + CXXFLAGS: ${{ matrix.cxxflags }} /D_WIN32_WINNT=0x0A00 /DWIN32_LEAN_AND_MEAN=1 /D_FILE_OFFSET_BITS=64 /DBOOST_ALL_NO_LIB /EHsc /bigobj LDFLAGS: ${{ matrix.ldflags }} steps: diff --git a/include/boost/mqtt5/impl/assemble_op.hpp b/include/boost/mqtt5/impl/assemble_op.hpp index 4cb9be9..0138f23 100644 --- a/include/boost/mqtt5/impl/assemble_op.hpp +++ b/include/boost/mqtt5/impl/assemble_op.hpp @@ -194,7 +194,7 @@ private: } uint32_t max_recv_size() const { - return std::min( + return (std::min)( _svc.connect_property(prop::maximum_packet_size) .value_or(default_max_recv_size), static_cast(default_max_send_size) diff --git a/test/integration/read_message.cpp b/test/integration/read_message.cpp index 5fd9c90..8961866 100644 --- a/test/integration/read_message.cpp +++ b/test/integration/read_message.cpp @@ -294,7 +294,7 @@ BOOST_DATA_TEST_CASE_F( 0, topic, payload1, qos_e::at_most_once, retain_e::no, dup_e::no, {} ); - const uint32_t max_packet_size = std::max( + const uint32_t max_packet_size = (std::max)( publish1.size(), publish1.size() * max_packet_size_multiplier + max_packet_size_offset );