diff options
author | Aaron Giles <aaron@aarongiles.com> | 2011-02-28 09:21:35 +0000 |
---|---|---|
committer | Aaron Giles <aaron@aarongiles.com> | 2011-02-28 09:21:35 +0000 |
commit | 173642d46ca44e7c930f9fe88e0e828ec27ffa21 (patch) | |
tree | fa147b43158b3f2230f2c33ac9b359760e585560 | |
parent | beb05ca537de127b42bef535ffa2d30596013c87 (diff) |
Fix attotime max() function to not be a copy of min(). Fixes several
regressions in the scheduler after the recent attotime object
conversion.
-rw-r--r-- | src/emu/attotime.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/emu/attotime.h b/src/emu/attotime.h index 26f72175b12..eb9e1ee2915 100644 --- a/src/emu/attotime.h +++ b/src/emu/attotime.h @@ -353,12 +353,12 @@ inline attotime min(const attotime &left, const attotime &right) inline attotime max(const attotime &left, const attotime &right) { if (left.seconds > right.seconds) - return right; - if (left.seconds < right.seconds) return left; - if (left.attoseconds > right.attoseconds) + if (left.seconds < right.seconds) return right; - return left; + if (left.attoseconds > right.attoseconds) + return left; + return right; } |