From 82b0bc9b58e70ecd46f443143215497f8aba6331 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Mon, 4 Jul 2016 19:10:10 -0400 Subject: [PATCH] Discovered that this is another meaningful usage of `using`. --- Components/6522/6522.hpp | 2 +- Machines/Vic-20/Vic20.hpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Components/6522/6522.hpp b/Components/6522/6522.hpp index c97adf70a..91e785aef 100644 --- a/Components/6522/6522.hpp +++ b/Components/6522/6522.hpp @@ -286,7 +286,7 @@ template class MOS6522 { void set_port_output(Port port, uint8_t value, uint8_t direction_mask) {} bool get_control_line(Port port, Line line) { return true; } void set_control_line_output(Port port, Line line, bool value) {} -// void set_interrupt_status(bool status) {} + void set_interrupt_status(bool status) {} // Input/output multiplexer uint8_t get_port_input(Port port, uint8_t output_mask, uint8_t output) diff --git a/Machines/Vic-20/Vic20.hpp b/Machines/Vic-20/Vic20.hpp index 3f5f247c8..43af4d36c 100644 --- a/Machines/Vic-20/Vic20.hpp +++ b/Machines/Vic-20/Vic20.hpp @@ -63,6 +63,8 @@ class UserPortVIA: public MOS::MOS6522, public MOS::MOS6522IRQDeleg printf("Tape motor %s\n", value ? "on" : "off"); } } + + using MOS6522IRQDelegate::set_interrupt_status; }; class KeyboardVIA: public MOS::MOS6522, public MOS::MOS6522IRQDelegate { @@ -108,6 +110,8 @@ class KeyboardVIA: public MOS::MOS6522, public MOS::MOS6522IRQDeleg } } + using MOS6522IRQDelegate::set_interrupt_status; + private: uint8_t _columns[8]; uint8_t _activation_mask;