boostorg/beast
1
0
Fork 1
mirror of https://github.com/boostorg/beast.git synced 2025-07-30 04:47:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Parenthesise all uses of min() and max()

Browse Source
This commit is contained in:
Richard Hodges
2021-03-16 09:49:13 +01:00
parent ae092100dc
commit fae4c0e3c2
5 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -1,3 +1,4 @@
* Parenthesise all uses of min() and max().
* Extend Drone MSVC tests.
* Fix MSVC build error.

2
example/http/server/fast/http_server_fast.cpp
View File

@ -297,7 +297,7 @@ private:
// Sleep indefinitely until we're given a new deadline.
request_deadline_.expires_at(
std::chrono::steady_clock::time_point::max());
(std::chrono::steady_clock::time_point::max)());
}
request_deadline_.async_wait(

2
test/beast/http/file_body.cpp
View File

@ -154,7 +154,7 @@ public:
std::size_t to_write = 4097;
while (written < to_write)
{
auto size = std::min(ten.size(), to_write - written);
auto size = (std::min)(ten.size(), to_write - written);
fstemp << ten.substr(0, size);
BEAST_EXPECT(fstemp.good());
written += size;

12
test/beast/websocket/_detail_prng.cpp
View File

@ -42,20 +42,20 @@ public:
void
testPrng(F const& f)
{
auto const min = std::numeric_limits<std::uint32_t>::min();
auto const max = std::numeric_limits<std::uint32_t>::max();
auto const mn = (std::numeric_limits<std::uint32_t>::min)();
auto const mx = (std::numeric_limits<std::uint32_t>::max)();
{
auto v = f()();
BEAST_EXPECT(
v >= min &&
v <= max);
v >= mn &&
v <= mx);
}
{
auto v = f()();
BEAST_EXPECT(
v >= min &&
v <= max);
v >= mn &&
v <= mx);
}
}

4
test/beast/zlib/inflate_stream.cpp
View File

@ -525,13 +525,13 @@ public:
zs.next_in = &*in.begin();
zs.next_out = &out[0];
zs.avail_in = std::min(in.size(), len);
zs.avail_in = (std::min)(in.size(), len);
zs.avail_out = out.size();
while (zs.avail_in > 0 && !ec)
{
is.write(zs, Flush::sync, ec);
auto n = std::min(zs.avail_in, len);
auto n = (std::min)(zs.avail_in, len);
zs.next_in = static_cast<char const*>(zs.next_in) + n;
zs.avail_in -= n;
}