45 lines
1.7 KiB
Diff
45 lines
1.7 KiB
Diff
From 1d5190dbe11629dfa8e32b7959db593780c757eb Mon Sep 17 00:00:00 2001
|
|
From: abrolag <willgodfrey@musically.me.uk>
|
|
Date: Mon, 8 Feb 2016 23:01:46 +0000
|
|
Subject: [PATCH] gcc 6 error fix?
|
|
|
|
---
|
|
src/Effects/Alienwah.cpp | 4 ++--
|
|
src/Misc/CmdInterface.cpp | 2 +-
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/Effects/Alienwah.cpp b/src/Effects/Alienwah.cpp
|
|
index 1c794cf..41e1a30 100644
|
|
--- a/src/Effects/Alienwah.cpp
|
|
+++ b/src/Effects/Alienwah.cpp
|
|
@@ -70,7 +70,7 @@ void Alienwah::out(float *smpsl, float *smpsr)
|
|
tmp = clfol * x + oldclfol * x1;
|
|
|
|
out = tmp * oldl[oldk];
|
|
- out.real() += (1 - abs(fb)) * smpsl[i] * pangainL;
|
|
+ out += (1 - abs(fb)) * smpsl[i] * pangainL;
|
|
|
|
oldl[oldk] = out;
|
|
float l = out.real() * 10.0f * (fb + 0.1f);
|
|
@@ -79,7 +79,7 @@ void Alienwah::out(float *smpsl, float *smpsr)
|
|
tmp = clfor * x + oldclfor * x1;
|
|
|
|
out = tmp * oldr[oldk];
|
|
- out.real() += (1 - abs(fb)) * smpsr[i] * pangainR;
|
|
+ out += (1 - abs(fb)) * smpsr[i] * pangainR;
|
|
|
|
oldr[oldk] = out;
|
|
float r = out.real() * 10.0f * (fb + 0.1f);
|
|
diff --git a/src/Misc/CmdInterface.cpp b/src/Misc/CmdInterface.cpp
|
|
index 061a420..3947f05 100644
|
|
--- a/src/Misc/CmdInterface.cpp
|
|
+++ b/src/Misc/CmdInterface.cpp
|
|
@@ -228,7 +228,7 @@ void CmdInterface::helpLoop(list<string>& msg, string *commands, int indent)
|
|
while (commands[word] != "end")
|
|
{
|
|
left = commands[word];
|
|
- msg.push_back(dent.assign<int>(indent, ' ') + left + blanks.assign<int>(spaces - left.length(), ' ') + "- " + commands[word + 1]);
|
|
+ msg.push_back(dent.assign(indent, ' ') + left + blanks.assign(spaces - left.length(), ' ') + "- " + commands[word + 1]);
|
|
word += 2;
|
|
}
|
|
}
|