From a7051e4e42c7fda17f3465a26e0ba1ea3c3fe377 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Wed, 18 Nov 2020 21:06:18 -0500 Subject: [PATCH] Strip this forceinline until I've satisfied myself that it works in declarations. --- Machines/Apple/AppleIIgs/Video.cpp | 2 +- Machines/Apple/AppleIIgs/Video.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Machines/Apple/AppleIIgs/Video.cpp b/Machines/Apple/AppleIIgs/Video.cpp index 8a366d657..a40e39d5f 100644 --- a/Machines/Apple/AppleIIgs/Video.cpp +++ b/Machines/Apple/AppleIIgs/Video.cpp @@ -345,7 +345,7 @@ bool VideoBase::get_composite_is_colour() { // MARK: - Outputters. -forceinline uint16_t *VideoBase::output_char(uint16_t *target, uint8_t source, int row) const { +uint16_t *VideoBase::output_char(uint16_t *target, uint8_t source, int row) const { const int character = source & character_zones_[source >> 6].address_mask; const uint8_t xor_mask = character_zones_[source >> 6].xor_mask; const std::size_t character_address = size_t(character << 3) + (row & 7); diff --git a/Machines/Apple/AppleIIgs/Video.hpp b/Machines/Apple/AppleIIgs/Video.hpp index f26b3c7bb..3d7e23ca6 100644 --- a/Machines/Apple/AppleIIgs/Video.hpp +++ b/Machines/Apple/AppleIIgs/Video.hpp @@ -85,7 +85,7 @@ class VideoBase: public Apple::II::VideoSwitches { uint16_t *output_text(uint16_t *target, int start, int end, int row) const; uint16_t *output_double_text(uint16_t *target, int start, int end, int row) const; - forceinline uint16_t *output_char(uint16_t *target, uint8_t source, int row) const; + uint16_t *output_char(uint16_t *target, uint8_t source, int row) const; // Super high-res per-line state. uint8_t line_control_;