From 9b63e8327fbab444e58487a69dfc2cc6c69b7c1e Mon Sep 17 00:00:00 2001 From: kamel5 Date: Sat, 15 May 2021 14:45:39 +0200 Subject: =?UTF-8?q?Fix=20Fehler:=20Aufruf=20des=20=C3=BCberladenen=20?= =?UTF-8?q?=C2=BBmin(int&,=20int&)=C2=AB=20ist=20nicht=20eindeutig?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- coreengine/functions.c | 4 ++-- coreengine/viewelementsdisplaymenu.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'coreengine') diff --git a/coreengine/functions.c b/coreengine/functions.c index 35cff67..0059867 100644 --- a/coreengine/functions.c +++ b/coreengine/functions.c @@ -1332,7 +1332,7 @@ int cFuncLoop::FuncWidth(void) { eOverflowType overflow = (eOverflowType)GetValue((int)eLoopAttribs::overflow); if (overflow == eOverflowType::cut) { int maxItems = GetValue((int)eLoopAttribs::maxitems); - numLoops = min(numLoops, maxItems); + numLoops = std::min(numLoops, maxItems); } if (numLoops > 0) return numLoops * columnWidth; @@ -1357,7 +1357,7 @@ int cFuncLoop::FuncHeight(void) { eOverflowType overflow = (eOverflowType)GetValue((int)eLoopAttribs::overflow); if (overflow == eOverflowType::cut) { int maxItems = GetValue((int)eLoopAttribs::maxitems); - numLoops = min(numLoops, maxItems); + numLoops = std::min(numLoops, maxItems); } else if (overflow == eOverflowType::wrap) { int loopWidth = Width(); if (loopWidth <= 0) diff --git a/coreengine/viewelementsdisplaymenu.c b/coreengine/viewelementsdisplaymenu.c index 37c9257..1eb7374 100644 --- a/coreengine/viewelementsdisplaymenu.c +++ b/coreengine/viewelementsdisplaymenu.c @@ -970,7 +970,7 @@ bool cVeDmLastrecordings::Parse(bool forced) { int MAX_RECORDINGS = 10; int availableRecordings = orderedRecs.size(); - int numRecordings = min(MAX_RECORDINGS, availableRecordings); + int numRecordings = std::min(MAX_RECORDINGS, availableRecordings); if (!numRecordings) return true; -- cgit v1.2.3