diff --git a/BasiliskII/src/slot_rom.cpp b/BasiliskII/src/slot_rom.cpp index 7d1e6ab4..5419d134 100644 --- a/BasiliskII/src/slot_rom.cpp +++ b/BasiliskII/src/slot_rom.cpp @@ -46,7 +46,7 @@ static uint32 p; // Check whether a mode with the specified depth exists static bool has_depth(video_depth depth) { - vector::const_iterator i = VideoModes.begin(), end = VideoModes.end(); + std::vector::const_iterator i = VideoModes.begin(), end = VideoModes.end(); while (i != end) { if (i->depth == depth) return true; diff --git a/BasiliskII/src/video.cpp b/BasiliskII/src/video.cpp index 82e3a1c0..c45a4b1c 100644 --- a/BasiliskII/src/video.cpp +++ b/BasiliskII/src/video.cpp @@ -39,7 +39,7 @@ // List of supported video modes -vector VideoModes; +std::vector VideoModes; // Description of the main monitor monitor_desc VideoMonitor; @@ -98,7 +98,7 @@ static std::vector::const_iterator find_mode(uint16 mode, uint32 id) static video_depth max_depth_of_resolution(uint32 id) { video_depth m = VDEPTH_1BIT; - vector::const_iterator i = VideoModes.begin(), end = VideoModes.end(); + std::vector::const_iterator i = VideoModes.begin(), end = VideoModes.end(); while (i != end) { if (i->depth > m) m = i->depth; @@ -114,7 +114,7 @@ static video_depth max_depth_of_resolution(uint32 id) static void get_size_of_resolution(uint32 id, uint32 &x, uint32 &y) { - vector::const_iterator i = VideoModes.begin(), end = VideoModes.end(); + std::vector::const_iterator i = VideoModes.begin(), end = VideoModes.end(); while (i != end) { if (i->resolution_id == id) { x = i->x; @@ -581,7 +581,7 @@ int16 VideoDriverStatus(uint32 pb, uint32 dce) uint16 mode = ReadMacInt16(param + csDepthMode); D(bug(" GetVideoParameters %04x/%08x\n", mode, id)); - vector::const_iterator i = VideoModes.begin(), end = VideoModes.end(); + std::vector::const_iterator i = VideoModes.begin(), end = VideoModes.end(); while (i != end) { if (DepthToAppleMode(i->depth) == mode && i->resolution_id == id) { uint32 vp = ReadMacInt32(param + csVPBlockPtr);