From 3a9a691090458cdae63cf1ff07a4b12224aa1589 Mon Sep 17 00:00:00 2001 From: smf- Date: Thu, 6 Feb 2020 15:50:18 +0000 Subject: clang 9.0.0 bundled with Visual Studio 2019 doesn't like this & there is little hope of a virtual method being inlined when called from a base class. (nw) --- src/devices/sound/es5506.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/devices/sound/es5506.h b/src/devices/sound/es5506.h index 3136e869ac7..a59b15cbe5d 100644 --- a/src/devices/sound/es5506.h +++ b/src/devices/sound/es5506.h @@ -106,9 +106,9 @@ protected: inline s32 interpolate(s32 sample1, s32 sample2, u64 accum); inline void apply_filters(es550x_voice *voice, s32 &sample); - virtual inline void update_envelopes(es550x_voice *voice) {}; - virtual inline void check_for_end_forward(es550x_voice *voice, u64 &accum) {}; - virtual inline void check_for_end_reverse(es550x_voice *voice, u64 &accum) {}; + virtual void update_envelopes(es550x_voice *voice); + virtual void check_for_end_forward(es550x_voice *voice, u64 &accum); + virtual void check_for_end_reverse(es550x_voice *voice, u64 &accum); void generate_dummy(es550x_voice *voice, u16 *base, s32 *lbuffer, s32 *rbuffer, int samples); void generate_ulaw(es550x_voice *voice, u16 *base, s32 *lbuffer, s32 *rbuffer, int samples); void generate_pcm(es550x_voice *voice, u16 *base, s32 *lbuffer, s32 *rbuffer, int samples); @@ -176,9 +176,9 @@ protected: virtual inline u32 get_ca(u32 control) override { return (control >> 10) & 7; } virtual inline u32 get_lp(u32 control) override { return (control >> 8) & LP_MASK; } - virtual inline void update_envelopes(es550x_voice *voice) override; - virtual inline void check_for_end_forward(es550x_voice *voice, u64 &accum) override; - virtual inline void check_for_end_reverse(es550x_voice *voice, u64 &accum) override; + virtual void update_envelopes(es550x_voice *voice) override; + virtual void check_for_end_forward(es550x_voice *voice, u64 &accum) override; + virtual void check_for_end_reverse(es550x_voice *voice, u64 &accum) override; virtual void generate_samples(s32 **outputs, int offset, int samples) override; private: @@ -221,9 +221,9 @@ protected: virtual inline u32 get_ca(u32 control) override { return (control >> 8) & 3; } virtual inline u32 get_bank(u32 control) override { return (control >> 2) & 1; } - virtual inline void update_envelopes(es550x_voice *voice) override; - virtual inline void check_for_end_forward(es550x_voice *voice, u64 &accum) override; - virtual inline void check_for_end_reverse(es550x_voice *voice, u64 &accum) override; + virtual void update_envelopes(es550x_voice *voice) override; + virtual void check_for_end_forward(es550x_voice *voice, u64 &accum) override; + virtual void check_for_end_reverse(es550x_voice *voice, u64 &accum) override; virtual void generate_samples(s32 **outputs, int offset, int samples) override; private: -- cgit v1.2.3