diff options
| author | Frank Neumann <fnu@yavdr.org> | 2017-05-21 19:45:23 +0200 |
|---|---|---|
| committer | Frank Neumann <fnu@yavdr.org> | 2017-05-21 19:45:23 +0200 |
| commit | b08459c154b41421bcfde5fb585738af78e59f12 (patch) | |
| tree | d352b172242a376eb4ec7c0ec772f5f0976d04e5 /conflictcheck.h | |
| parent | 263efac2686729be6077377fc4faf05307ea56a9 (diff) | |
| download | vdr-plugin-epgsearch-b08459c154b41421bcfde5fb585738af78e59f12.tar.gz vdr-plugin-epgsearch-b08459c154b41421bcfde5fb585738af78e59f12.tar.bz2 | |
Commit epgsearch_min_max_from_stl.diff (thx jasminj@vdr-portal)
Diffstat (limited to 'conflictcheck.h')
| -rw-r--r-- | conflictcheck.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/conflictcheck.h b/conflictcheck.h index 4fef372..4afc05d 100644 --- a/conflictcheck.h +++ b/conflictcheck.h @@ -114,7 +114,7 @@ class cConflictCheckDevice { int prio = -1; for(std::set<cConflictCheckTimerObj*,TimerObjSort>::iterator it = recTimers.begin(); it != recTimers.end(); ++it) - prio = max(prio, (*it)->timer->Priority()); + prio = std::max(prio, (*it)->timer->Priority()); return prio; }; int CardIndex(void) const { if (device) return device->CardIndex(); else return devicenr;} |