From 58787bb166bec6c32107019be86fc218346d1621 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 22 Dec 2023 14:51:52 +0100
Subject: [PATCH] COMP: avoid ambiguous max() call on MacOS (fixes #3066)
- had max(std::streamsize, label) but this does not resolve properly
on OSX, so write out in long form instead.
The similar logic in DynamicList is okay since there it compares
max(label, label) instead
---
src/OpenFOAM/db/IOstreams/memory/memoryStreamBuffer.H | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/OpenFOAM/db/IOstreams/memory/memoryStreamBuffer.H b/src/OpenFOAM/db/IOstreams/memory/memoryStreamBuffer.H
index 8de6992f870..ea9ef6abe05 100644
--- a/src/OpenFOAM/db/IOstreams/memory/memoryStreamBuffer.H
+++ b/src/OpenFOAM/db/IOstreams/memory/memoryStreamBuffer.H
@@ -519,7 +519,8 @@ public:
if (newCapacity < len)
{
// Increase capacity (doubling)
- newCapacity = max(len, label(2*storage_.size()));
+ newCapacity =
+ Foam::max(label(len), label(2*storage_.size()));
}
// Info<<"request:" << len
--
GitLab