From 4439ee44ae690189bc0911120f92d867391a2415 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Heusipp?= Date: Wed, 8 May 2024 06:13:58 +0000 Subject: [PATCH] Merged revision(s) 20726 from trunk/OpenMPT: [Fix] Static (internal linkage) functions in namespace scope in headers can cause ODR-violations when used by external linkage inline functions. ........ git-svn-id: https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.30@20730 56274372-70c3-4bfc-bfc3-4c3a0b034d27 --- soundlib/MixerInterface.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/soundlib/MixerInterface.h b/soundlib/MixerInterface.h index 43d2f677741..f0d24284f78 100644 --- a/soundlib/MixerInterface.h +++ b/soundlib/MixerInterface.h @@ -66,7 +66,7 @@ struct NoInterpolation // FilterFunc: Functor for applying the resonant filter // MixFunc: Functor for mixing the computed sample data into the output buffer template -static void SampleLoop(ModChannel &chn, const CResampler &resampler, typename Traits::output_t * MPT_RESTRICT outBuffer, unsigned int numSamples) +inline void SampleLoop(ModChannel &chn, const CResampler &resampler, typename Traits::output_t * MPT_RESTRICT outBuffer, unsigned int numSamples) { ModChannel &c = chn; const typename Traits::input_t * MPT_RESTRICT inSample = static_cast(c.pCurrentSample);