Fixes to allow building on GCC 5.3.1

This commit is contained in:
Jean Pierre Cimalando 2020-02-01 16:11:40 +01:00
parent 05608108fc
commit 9c321af37b
2 changed files with 2 additions and 2 deletions

View file

@ -767,7 +767,7 @@ float sfz::Region::velocityCurve(uint8_t velocity) const noexcept
return gain;
}
constexpr uint8_t offsetAndClamp(uint8_t key, int offset, sfz::Range<uint8_t> range)
uint8_t offsetAndClamp(uint8_t key, int offset, sfz::Range<uint8_t> range)
{
const int offsetKey { key + offset };
if (offsetKey > std::numeric_limits<uint8_t>::max())

View file

@ -165,7 +165,7 @@ void sfz::Synth::handleControlOpcodes(const std::vector<Opcode>& members)
[[fallthrough]];
case hash("label_cc"):
if (member.parameter && Default::ccNumberRange.containsWithEnd(*member.parameter))
ccNames.emplace_back(*member.parameter, member.value);
ccNames.emplace_back(*member.parameter, std::string(member.value));
break;
case hash("Default_path"):
[[fallthrough]];