From 7d4c5c7848f817a254d134a757f9be94dbdaded3 Mon Sep 17 00:00:00 2001 From: arbee Date: Sun, 28 Nov 2021 22:48:15 -0500 Subject: apple2: properly instantiate the template methods [R. Belmont] --- src/mame/video/apple2.cpp | 20 ++++++++------------ src/mame/video/apple2.h | 2 -- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/mame/video/apple2.cpp b/src/mame/video/apple2.cpp index 49bc86d8687..b5ed4281205 100644 --- a/src/mame/video/apple2.cpp +++ b/src/mame/video/apple2.cpp @@ -764,18 +764,14 @@ void a2_video_device::text_update(screen_device &screen, bitmap_ind16 &bitmap, c } } -// this function forces all of the template versions to be created, otherwise there's a link error -void a2_video_device::hackery(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow) -{ - text_update(screen, bitmap, cliprect, beginrow, endrow); - text_update(screen, bitmap, cliprect, beginrow, endrow); - text_update(screen, bitmap, cliprect, beginrow, endrow); - text_update(screen, bitmap, cliprect, beginrow, endrow); - text_update(screen, bitmap, cliprect, beginrow, endrow); - text_update(screen, bitmap, cliprect, beginrow, endrow); - text_update(screen, bitmap, cliprect, beginrow, endrow); - text_update(screen, bitmap, cliprect, beginrow, endrow); -} +template void a2_video_device::text_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); +template void a2_video_device::text_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); +template void a2_video_device::text_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); +template void a2_video_device::text_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); +template void a2_video_device::text_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); +template void a2_video_device::text_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); +template void a2_video_device::text_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); +template void a2_video_device::text_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); void a2_video_device::text_update_jplus(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow) { diff --git a/src/mame/video/apple2.h b/src/mame/video/apple2.h index 80087708661..9d1d4a64e36 100644 --- a/src/mame/video/apple2.h +++ b/src/mame/video/apple2.h @@ -78,8 +78,6 @@ private: void plot_text_character_ultr(bitmap_ind16 &bitmap, int xpos, int ypos, int xscale, uint32_t code, int fg, int bg); void plot_text_character_jplus(bitmap_ind16 &bitmap, int xpos, int ypos, int xscale, uint32_t code, int fg, int bg); void plot_text_characterGS(bitmap_ind16 &bitmap, int xpos, int ypos, int xscale, uint32_t code, int fg, int bg); - - void hackery(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); }; // device type definition -- cgit v1.2.3