diff options
author | 2016-07-31 11:50:20 +0200 | |
---|---|---|
committer | 2016-07-31 14:41:02 +0200 | |
commit | 9667c6a8cce1829a7321dde67bd0287c73234386 (patch) | |
tree | f3665957d557cb18728a40e75f7d9f2341aaff1d /src/lib/formats/apridisk.cpp | |
parent | 69ac4affc86caac51ff9720083ed128dabdb932f (diff) |
std::min and std:max instead of MIN and MAX, also some more macros converted to inline functions (nw)
Diffstat (limited to 'src/lib/formats/apridisk.cpp')
-rw-r--r-- | src/lib/formats/apridisk.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/formats/apridisk.cpp b/src/lib/formats/apridisk.cpp index b19e2c26bd7..08fd6777bd9 100644 --- a/src/lib/formats/apridisk.cpp +++ b/src/lib/formats/apridisk.cpp @@ -74,9 +74,9 @@ bool apridisk_format::load(io_generic *io, UINT32 form_factor, floppy_image *ima UINT8 sector = pick_integer_le(§or_header, 13, 1); UINT8 track = (UINT8) pick_integer_le(§or_header, 14, 2); - track_count = MAX(track_count, track); - head_count = MAX(head_count, head); - sector_count = MAX(sector_count, sector); + track_count = std::max(track_count, int(track)); + head_count = std::max(head_count, int(head)); + sector_count = std::max(sector_count, int(sector)); // build sector info sectors[track][head][sector - 1].head = head; |