Andrew Geissler | 220dafd | 2023-10-04 10:18:08 -0500 | [diff] [blame^] | 1 | From b172ebe7e709b10338c1b260310dacc15c557cff Mon Sep 17 00:00:00 2001 |
| 2 | From: Martin Jansa <martin.jansa@gmail.com> |
| 3 | Date: Fri, 22 Sep 2023 15:37:29 +0200 |
| 4 | Subject: [PATCH] Fix build on 32bit |
| 5 | |
| 6 | * fixes: |
| 7 | src/mongo/util/net/http_client_curl.cpp: In function 'size_t mongo::{anonymous}::ReadMemoryCallback(char*, size_t, size_t, void*)': |
| 8 | src/mongo/util/net/http_client_curl.cpp:172:21: error: no matching function for call to 'min(size_t, long unsigned int)' |
| 9 | 172 | std::min(size * nitems, static_cast<unsigned long>(bufReader->remaining())); |
| 10 | | ~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
| 11 | |
| 12 | * reported in: |
| 13 | https://jira.mongodb.org/browse/SERVER-73007 |
| 14 | but will probably get closed like: |
| 15 | mongodb/0001-Fix-type-mismatch-on-32bit-arches.patch |
| 16 | submitted in: |
| 17 | https://jira.mongodb.org/browse/SERVER-74633 |
| 18 | as they don't support 32bit builds |
| 19 | |
| 20 | Signed-off-by: Martin Jansa <martin.jansa@gmail.com> |
| 21 | Upstream-Status: Pending |
| 22 | --- |
| 23 | src/mongo/util/net/http_client_curl.cpp | 2 +- |
| 24 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 25 | |
| 26 | diff --git a/src/mongo/util/net/http_client_curl.cpp b/src/mongo/util/net/http_client_curl.cpp |
| 27 | index 57290d0f8ed..f251fe2a550 100644 |
| 28 | --- a/src/mongo/util/net/http_client_curl.cpp |
| 29 | +++ b/src/mongo/util/net/http_client_curl.cpp |
| 30 | @@ -169,7 +169,7 @@ size_t ReadMemoryCallback(char* buffer, size_t size, size_t nitems, void* instre |
| 31 | |
| 32 | if (bufReader->remaining() > 0) { |
| 33 | size_t readSize = |
| 34 | - std::min(size * nitems, static_cast<unsigned long>(bufReader->remaining())); |
| 35 | + std::min(size * nitems, static_cast<size_t>(bufReader->remaining())); |
| 36 | auto buf = bufReader->readBytes(readSize); |
| 37 | memcpy(buffer, buf.rawData(), readSize); |
| 38 | ret = readSize; |