Merge branch 'master' into CommodoreAnalyser

TomHarte · Dec 5, 2024 · e835b2c · e835b2c
2 parents e7f0eb6 + 10d20f5
commit e835b2c
Show file tree

Hide file tree

Showing 46 changed files with 5,717 additions and 5,715 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -5,7 +5,7 @@ jobs:
     name: Mac UI / xcodebuild / ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-12, macos-13, macos-14]
+        os: [macos-13, macos-14, macos-15]
     runs-on: ${{ matrix.os }}
     steps:
     - name: Checkout
@@ -53,7 +53,7 @@ jobs:
     name: SDL UI / scons / ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-14, ubuntu-latest]
+        os: [macos-latest, ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
     - name: Checkout

diff --git a/Analyser/Static/Commodore/Disk.cpp b/Analyser/Static/Commodore/Disk.cpp
@@ -70,7 +70,7 @@ class CommodoreGCRParser: public Storage::Disk::Controller {
 	uint8_t track_;
 	std::shared_ptr<Sector> sector_cache_[65536];
 
-	void process_input_bit(const int value) {
+	void process_input_bit(const int value) override {
 		shift_register_ = ((shift_register_ << 1) | unsigned(value)) & 0x3ff;
 		bit_count_++;
 	}
@@ -107,7 +107,7 @@ class CommodoreGCRParser: public Storage::Disk::Controller {
 		}
 	}
 
-	void process_index_hole() {
+	void process_index_hole() override {
 		index_count_++;
 	}