valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Switch from std::vector to std::array

Browse source
This commit is contained in:
krcroft 2019-12-08 23:40:22 -08:00 • committed by Patryk Obara
parent 78cc6be86d
commit ef2686ac02
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/bios_disk.h
View file

@ -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 */

5
src/ints/bios_disk.cpp
View file

@ -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) {