Author: manx
Date: Wed May 8 08:14:40 2024
New Revision: 20732
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20732
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.28/ (props changed)
branches/OpenMPT-1.28/soundlib/MixerInterface.h
Modified: branches/OpenMPT-1.28/soundlib/MixerInterface.h
==============================================================================
--- branches/OpenMPT-1.28/soundlib/MixerInterface.h Wed May 8 08:14:19 2024 (r20731)
+++ branches/OpenMPT-1.28/soundlib/MixerInterface.h Wed May 8 08:14:40 2024 (r20732)
@@ -67,7 +67,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);
|
