From d8a119e5421d6303c646ada2d7149599ff8fda82 Mon Sep 17 00:00:00 2001 From: ed Date: Wed, 1 Jul 2020 18:28:59 +0100 Subject: [PATCH] Fixed some GCC 5 compatibility issues --- examples/Plugins/SamplerPluginDemo.h | 6 +++--- modules/juce_dsp/frequency/juce_Convolution.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/Plugins/SamplerPluginDemo.h b/examples/Plugins/SamplerPluginDemo.h index 5e672773b5..dc0181e6dc 100644 --- a/examples/Plugins/SamplerPluginDemo.h +++ b/examples/Plugins/SamplerPluginDemo.h @@ -463,11 +463,11 @@ private: nextSamplePos = begin; nextDirection = Direction::forward; - return { nextSamplePos, nextDirection }; + return std::tuple (nextSamplePos, nextDirection); } if (samplerSound->getLoopMode() == LoopMode::none) - return { nextSamplePos, nextDirection }; + return std::tuple (nextSamplePos, nextDirection); if (nextDirection == Direction::forward && end < nextSamplePos && !isTailingOff()) { @@ -479,7 +479,7 @@ private: nextDirection = Direction::backward; } } - return { nextSamplePos, nextDirection }; + return std::tuple (nextSamplePos, nextDirection); } std::shared_ptr samplerSound; diff --git a/modules/juce_dsp/frequency/juce_Convolution.cpp b/modules/juce_dsp/frequency/juce_Convolution.cpp index 36ea1d3c51..8983676570 100644 --- a/modules/juce_dsp/frequency/juce_Convolution.cpp +++ b/modules/juce_dsp/frequency/juce_Convolution.cpp @@ -608,7 +608,7 @@ static void normaliseImpulseResponse (AudioBuffer& buf) const auto numSamples = buf.getNumSamples(); const auto channelPtrs = buf.getArrayOfWritePointers(); - const auto maxSumSquaredMag = std::accumulate (channelPtrs, channelPtrs + numChannels, 0.0f, [&] (auto max, auto* channel) + const auto maxSumSquaredMag = std::accumulate (channelPtrs, channelPtrs + numChannels, 0.0f, [numSamples] (auto max, auto* channel) { return jmax (max, std::accumulate (channel, channel + numSamples, 0.0f, [] (auto sum, auto samp) { @@ -618,7 +618,7 @@ static void normaliseImpulseResponse (AudioBuffer& buf) const auto normalisationFactor = calculateNormalisationFactor (maxSumSquaredMag); - std::for_each (channelPtrs, channelPtrs + numChannels, [&] (auto* channel) + std::for_each (channelPtrs, channelPtrs + numChannels, [normalisationFactor, numSamples] (auto* channel) { FloatVectorOperations::multiply (channel, normalisationFactor, numSamples); });