From ef2686ac020bfff20ff205f0c6e6cf96aa724358 Mon Sep 17 00:00:00 2001
From: krcroft <krcroft@users.noreply.github.com>
Date: Sun, 8 Dec 2019 23:40:22 -0800
Subject: [PATCH] Switch from std::vector to std::array

---
 include/bios_disk.h    | 7 ++++---
 src/ints/bios_disk.cpp | 5 ++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/bios_disk.h b/include/bios_disk.h
index 755e16db..160d1c31 100644
--- a/include/bios_disk.h
+++ b/include/bios_disk.h
@@ -21,7 +21,7 @@
 
 #include <memory>
 #include <stdio.h>
-#include <vector>
+#include <array>
 #ifndef DOSBOX_MEM_H
 #include "mem.h"
 #endif
@@ -81,8 +81,9 @@ void incrementFDD(void);
 
 #define MAX_DISK_IMAGES (2 + MAX_HDD_IMAGES)
 
-extern std::vector<std::unique_ptr<imageDisk>> imageDiskList;
-extern std::vector<std::unique_ptr<imageDisk>> diskSwap;
+extern std::array<std::unique_ptr<imageDisk>, MAX_DISK_IMAGES> imageDiskList;
+extern std::array<std::unique_ptr<imageDisk>, MAX_SWAPPABLE_DISKS> diskSwap;
+
 extern Bit32s swapPosition;
 extern Bit16u imgDTASeg; /* Real memory location of temporary DTA pointer for fat image disk access */
 extern RealPt imgDTAPtr; /* Real memory location of temporary DTA pointer for fat image disk access */
diff --git a/src/ints/bios_disk.cpp b/src/ints/bios_disk.cpp
index b74651a6..90557f1c 100644
--- a/src/ints/bios_disk.cpp
+++ b/src/ints/bios_disk.cpp
@@ -16,7 +16,6 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-
 #include <utility>
 #include "dosbox.h"
 #include "callback.h"
@@ -57,8 +56,8 @@ static bool swapping_requested;
 void CMOS_SetRegister(Bitu regNr, Bit8u val); //For setting equipment word
 
 /* 2 floppys and 2 harddrives, max */
-std::vector<std::unique_ptr<imageDisk>> imageDiskList(MAX_DISK_IMAGES);
-std::vector<std::unique_ptr<imageDisk>> diskSwap(MAX_SWAPPABLE_DISKS);
+std::array<std::unique_ptr<imageDisk>, MAX_DISK_IMAGES> imageDiskList;
+std::array<std::unique_ptr<imageDisk>, MAX_SWAPPABLE_DISKS> diskSwap;
 Bit32s swapPosition;
 
 void updateDPT(void) {