6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-02-18 01:30:56 +00:00
Code Issues Projects Releases Wiki Activity

Walk back slightly.

Browse Source
This commit is contained in:
Thomas Harte 2021-10-14 18:02:58 -07:00
parent 689bfbbdb3
commit d9d20d9d30
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Components/DiskII/DiskII.cpp
View File

@ -22,7 +22,10 @@ namespace {
DiskII::DiskII(int clock_rate) : DiskII::DiskII(int clock_rate) :
clock_rate_(clock_rate), clock_rate_(clock_rate),
inputs_(input_command), inputs_(input_command),
drives_{Storage::Disk::Drive{clock_rate, 300, 1}, Storage::Disk::Drive{clock_rate, 300, 1}} drives_{
Storage::Disk::Drive{clock_rate, 300, 1},
Storage::Disk::Drive{clock_rate, 300, 1}
}
{ {
drives_[0].set_clocking_hint_observer(this); drives_[0].set_clocking_hint_observer(this);
drives_[1].set_clocking_hint_observer(this); drives_[1].set_clocking_hint_observer(this);

10
Storage/Disk/Drive.hpp
View File

@ -37,8 +37,14 @@ class Drive: public ClockingHint::Source, public TimedEventLoop {
Drive(int input_clock_rate, int number_of_heads, ReadyType rdy_type = ReadyType::ShugartRDY); Drive(int input_clock_rate, int number_of_heads, ReadyType rdy_type = ReadyType::ShugartRDY);
virtual ~Drive(); virtual ~Drive();
// Disallow copying. // TODO: Disallow copying.
Drive(const Drive &) = delete; //
// GCC has an issue with the way the DiskII constructs its drive array if these are both
// deleted, despite not using the copy constructor. Unless I'm deficient in my interpretation.
// Clang has no such issue though, so possibly I'm not.
//
// Change withdrawn until I can figure out what's afoot.
// Drive(const Drive &) = delete;
void operator=(const Drive &) = delete; void operator=(const Drive &) = delete;
/*! /*!