From: <sv...@op...> - 2024-05-08 06:14:31
|
Author: manx Date: Wed May 8 08:14:19 2024 New Revision: 20731 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20731 Log: 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. ........ Modified: branches/OpenMPT-1.29/ (props changed) branches/OpenMPT-1.29/soundlib/MixerInterface.h Modified: branches/OpenMPT-1.29/soundlib/MixerInterface.h ============================================================================== --- branches/OpenMPT-1.29/soundlib/MixerInterface.h Wed May 8 08:13:58 2024 (r20730) +++ branches/OpenMPT-1.29/soundlib/MixerInterface.h Wed May 8 08:14:19 2024 (r20731) @@ -66,7 +66,7 @@ // FilterFunc: Functor for applying the resonant filter // MixFunc: Functor for mixing the computed sample data into the output buffer template<class Traits, class InterpolationFunc, class FilterFunc, class MixFunc> -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<const typename Traits::input_t *>(c.pCurrentSample); |