From 293e746e57f5b05ffe50ae388a33654f138d7b99 Mon Sep 17 00:00:00 2001 From: hogliux Date: Mon, 7 Aug 2017 10:56:28 +0100 Subject: [PATCH] Fixed a live-build compiler-error when building the DSP module --- modules/juce_dsp/maths/juce_Matrix.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/juce_dsp/maths/juce_Matrix.h b/modules/juce_dsp/maths/juce_Matrix.h index 7c8d252221..756b573970 100644 --- a/modules/juce_dsp/maths/juce_Matrix.h +++ b/modules/juce_dsp/maths/juce_Matrix.h @@ -130,10 +130,10 @@ public: //============================================================================== /** Addition of two matrices */ - inline Matrix& operator+= (const Matrix& other) noexcept { return apply (other, std::plus()); } + inline Matrix& operator+= (const Matrix& other) noexcept { return apply (other, [] (ElementType a, ElementType b) { return a + b; } ); } /** Subtraction of two matrices */ - inline Matrix& operator-= (const Matrix& other) noexcept { return apply (other, std::minus()); } + inline Matrix& operator-= (const Matrix& other) noexcept { return apply (other, [] (ElementType a, ElementType b) { return a - b; } ); } /** Scalar multiplication */ inline Matrix& operator*= (ElementType scalar) noexcept @@ -155,7 +155,7 @@ public: Matrix operator* (const Matrix& other) const; /** Does a hadarmard product with the receiver and other and stores the result in the receiver */ - inline Matrix& hadarmard (const Matrix& other) noexcept { return apply (other, std::multiplies()); } + inline Matrix& hadarmard (const Matrix& other) noexcept { return apply (other, [] (ElementType a, ElementType b) { return a * b; } ); } /** Does a hadarmard product with a and b returns the result. */ static inline Matrix hadarmard (const Matrix& a, const Matrix& b) { Matrix result (a); result.hadarmard (b); return result; }