From ae21782adce04195a4f9d664c1b3ca8107c308a5 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sun, 3 Dec 2017 15:43:59 -0500 Subject: [PATCH] Corrects two Cartridge type mismatches. --- Storage/Cartridge/Cartridge.cpp | 2 +- Storage/Cartridge/Cartridge.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Storage/Cartridge/Cartridge.cpp b/Storage/Cartridge/Cartridge.cpp index 842ccbfaf..10582f6cd 100644 --- a/Storage/Cartridge/Cartridge.cpp +++ b/Storage/Cartridge/Cartridge.cpp @@ -8,5 +8,5 @@ #include "Cartridge.hpp" -const size_t Storage::Cartridge::Cartridge::Segment::UnknownAddress = -1; +const size_t Storage::Cartridge::Cartridge::Segment::UnknownAddress = static_cast(-1); diff --git a/Storage/Cartridge/Cartridge.hpp b/Storage/Cartridge/Cartridge.hpp index 5493c11af..e5dc14c31 100644 --- a/Storage/Cartridge/Cartridge.hpp +++ b/Storage/Cartridge/Cartridge.hpp @@ -31,7 +31,7 @@ class Cartridge { Segment(size_t start_address, size_t end_address, std::vector data) : start_address(start_address), end_address(end_address), data(std::move(data)) {} - Segment(int start_address, std::vector data) : + Segment(size_t start_address, std::vector data) : Segment(start_address, start_address + data.size(), data) {} /// Indicates that an address is unknown.