From e92e06a5f416135e9d434cb64c438cfcf825f97c Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Mon, 23 Apr 2018 20:20:14 -0700 Subject: [PATCH] Doubled down on the ROMMachine::ROMFetcher typedef. --- Analyser/Static/AppleII/Target.hpp | 2 +- Machines/AmstradCPC/AmstradCPC.cpp | 2 +- Machines/ColecoVision/ColecoVision.cpp | 2 +- Machines/Commodore/1540/C1540.hpp | 2 +- Machines/Commodore/1540/Implementation/C1540.cpp | 2 +- Machines/Commodore/Vic-20/Vic20.cpp | 2 +- Machines/Electron/Electron.cpp | 2 +- Machines/MSX/MSX.cpp | 2 +- Machines/Oric/Oric.cpp | 2 +- Machines/ZX8081/ZX8081.cpp | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Analyser/Static/AppleII/Target.hpp b/Analyser/Static/AppleII/Target.hpp index 0f47d3a62..7bd90107d 100644 --- a/Analyser/Static/AppleII/Target.hpp +++ b/Analyser/Static/AppleII/Target.hpp @@ -16,7 +16,7 @@ namespace Static { namespace AppleII { struct Target: public ::Analyser::Static::Target { - // TODO: probably some Disk II options here? + bool has_disk_; // TODO: Disk II versus IWM? }; } diff --git a/Machines/AmstradCPC/AmstradCPC.cpp b/Machines/AmstradCPC/AmstradCPC.cpp index e5278fec6..58ab1bce2 100644 --- a/Machines/AmstradCPC/AmstradCPC.cpp +++ b/Machines/AmstradCPC/AmstradCPC.cpp @@ -941,7 +941,7 @@ class ConcreteMachine: } // Obtains the system ROMs. - bool set_rom_fetcher(const std::function>>(const std::string &machine, const std::vector &names)> &roms_with_names) override { + bool set_rom_fetcher(const ROMMachine::ROMFetcher &roms_with_names) override { auto roms = roms_with_names( "AmstradCPC", { diff --git a/Machines/ColecoVision/ColecoVision.cpp b/Machines/ColecoVision/ColecoVision.cpp index 67915f5d9..a371f619e 100644 --- a/Machines/ColecoVision/ColecoVision.cpp +++ b/Machines/ColecoVision/ColecoVision.cpp @@ -183,7 +183,7 @@ class ConcreteMachine: } // Obtains the system ROMs. - bool set_rom_fetcher(const std::function>>(const std::string &machine, const std::vector &names)> &roms_with_names) override { + bool set_rom_fetcher(const ROMMachine::ROMFetcher &roms_with_names) override { auto roms = roms_with_names( "ColecoVision", { "coleco.rom" }); diff --git a/Machines/Commodore/1540/C1540.hpp b/Machines/Commodore/1540/C1540.hpp index 5d9b521c3..87376097d 100644 --- a/Machines/Commodore/1540/C1540.hpp +++ b/Machines/Commodore/1540/C1540.hpp @@ -31,7 +31,7 @@ class Machine: public MachineBase, public ROMMachine::Machine { /*! Sets the source for this drive's ROM image. */ - bool set_rom_fetcher(const std::function>>(const std::string &machine, const std::vector &names)> &roms_with_names); + bool set_rom_fetcher(const ROMMachine::ROMFetcher &roms_with_names); /*! Sets the serial bus to which this drive should attach itself. diff --git a/Machines/Commodore/1540/Implementation/C1540.cpp b/Machines/Commodore/1540/Implementation/C1540.cpp index f1677ef3b..b3d702bc2 100644 --- a/Machines/Commodore/1540/Implementation/C1540.cpp +++ b/Machines/Commodore/1540/Implementation/C1540.cpp @@ -82,7 +82,7 @@ Cycles MachineBase::perform_bus_operation(CPU::MOS6502::BusOperation operation, return Cycles(1); } -bool Machine::set_rom_fetcher(const std::function>>(const std::string &machine, const std::vector &names)> &roms_with_names) { +bool Machine::set_rom_fetcher(const ROMMachine::ROMFetcher &roms_with_names) { std::string rom_name; switch(personality_) { case Personality::C1540: rom_name = "1540.bin"; break; diff --git a/Machines/Commodore/Vic-20/Vic20.cpp b/Machines/Commodore/Vic-20/Vic20.cpp index fa9e54939..39deb6516 100644 --- a/Machines/Commodore/Vic-20/Vic20.cpp +++ b/Machines/Commodore/Vic-20/Vic20.cpp @@ -336,7 +336,7 @@ class ConcreteMachine: } // Obtains the system ROMs. - bool set_rom_fetcher(const std::function>>(const std::string &machine, const std::vector &names)> &roms_with_names) override { + bool set_rom_fetcher(const ROMMachine::ROMFetcher &roms_with_names) override { rom_fetcher_ = roms_with_names; auto roms = roms_with_names( diff --git a/Machines/Electron/Electron.cpp b/Machines/Electron/Electron.cpp index ef9eb8417..36a2ff5fd 100644 --- a/Machines/Electron/Electron.cpp +++ b/Machines/Electron/Electron.cpp @@ -90,7 +90,7 @@ class ConcreteMachine: } // Obtains the system ROMs. - bool set_rom_fetcher(const std::function>>(const std::string &machine, const std::vector &names)> &roms_with_names) override { + bool set_rom_fetcher(const ROMMachine::ROMFetcher &roms_with_names) override { auto roms = roms_with_names( "Electron", { diff --git a/Machines/MSX/MSX.cpp b/Machines/MSX/MSX.cpp index e94b9ed50..e1c693094 100644 --- a/Machines/MSX/MSX.cpp +++ b/Machines/MSX/MSX.cpp @@ -464,7 +464,7 @@ class ConcreteMachine: } // Obtains the system ROMs. - bool set_rom_fetcher(const std::function>>(const std::string &machine, const std::vector &names)> &roms_with_names) override { + bool set_rom_fetcher(const ROMMachine::ROMFetcher &roms_with_names) override { auto roms = roms_with_names( "MSX", { diff --git a/Machines/Oric/Oric.cpp b/Machines/Oric/Oric.cpp index 03c86be0f..f0292fd11 100644 --- a/Machines/Oric/Oric.cpp +++ b/Machines/Oric/Oric.cpp @@ -220,7 +220,7 @@ class ConcreteMachine: } // Obtains the system ROMs. - bool set_rom_fetcher(const std::function>>(const std::string &machine, const std::vector &names)> &roms_with_names) override { + bool set_rom_fetcher(const ROMMachine::ROMFetcher &roms_with_names) override { auto roms = roms_with_names( "Oric", { diff --git a/Machines/ZX8081/ZX8081.cpp b/Machines/ZX8081/ZX8081.cpp index 9b9e52dfe..fd15e1e46 100644 --- a/Machines/ZX8081/ZX8081.cpp +++ b/Machines/ZX8081/ZX8081.cpp @@ -346,7 +346,7 @@ template class ConcreteMachine: } // Obtains the system ROMs. - bool set_rom_fetcher(const std::function>>(const std::string &machine, const std::vector &names)> &roms_with_names) override { + bool set_rom_fetcher(const ROMMachine::ROMFetcher &roms_with_names) override { const auto roms = roms_with_names( "ZX8081", {