Skip to content

Commit

Permalink
Merged revision(s) 20726 from trunk/OpenMPT:
Browse files Browse the repository at this point in the history
[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
  • Loading branch information
manxorist committed May 8, 2024
1 parent 616865d commit 4439ee4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion soundlib/MixerInterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -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<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);
Expand Down

0 comments on commit 4439ee4

Please sign in to comment.