diff options
| author | kamel5 <vdr.kamel5 (at) gmx (dot) net> | 2021-05-15 14:45:39 +0200 |
|---|---|---|
| committer | kamel5 <vdr.kamel5 (at) gmx (dot) net> | 2021-05-15 14:57:16 +0200 |
| commit | 9b63e8327fbab444e58487a69dfc2cc6c69b7c1e (patch) | |
| tree | d75c0887ff5902fd8b41c19c319c65cfb01cbb53 /coreengine | |
| parent | a7fc762b3dabefc1ec6a04fbf290f702d203fdf0 (diff) | |
| download | vdr-plugin-skindesigner-9b63e8327fbab444e58487a69dfc2cc6c69b7c1e.tar.gz vdr-plugin-skindesigner-9b63e8327fbab444e58487a69dfc2cc6c69b7c1e.tar.bz2 | |
Fix Fehler: Aufruf des überladenen »min(int&, int&)« ist nicht eindeutig
Diffstat (limited to 'coreengine')
| -rw-r--r-- | coreengine/functions.c | 4 | ||||
| -rw-r--r-- | coreengine/viewelementsdisplaymenu.c | 2 |
2 files changed, 3 insertions, 3 deletions
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; |