diff options
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;} |