From ec13c70b8286befc4def3675af4d4cbdf59f7707 Mon Sep 17 00:00:00 2001 From: Paul Ferrand Date: Thu, 7 May 2020 23:16:07 +0200 Subject: [PATCH] C++11 does not like constexpr --- src/sfizz/Voice.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/sfizz/Voice.h b/src/sfizz/Voice.h index a6fbc187..4f2b880c 100644 --- a/src/sfizz/Voice.h +++ b/src/sfizz/Voice.h @@ -156,19 +156,19 @@ public: * * @return int */ - constexpr int getTriggerNumber() const noexcept { return triggerNumber; } + int getTriggerNumber() const noexcept { return triggerNumber; } /** * @brief Get the value that triggered the voice (note velocity or cc value) * * @return float */ - constexpr float getTriggerValue() const noexcept { return triggerValue; } + float getTriggerValue() const noexcept { return triggerValue; } /** * @brief Get the type of trigger * * @return TriggerType */ - constexpr TriggerType getTriggerType() const noexcept { return triggerType; } + TriggerType getTriggerType() const noexcept { return triggerType; } /** * @brief Reset the voice to its initial values @@ -220,7 +220,7 @@ public: * * @return */ - constexpr int getAge() const noexcept { return age; } + int getAge() const noexcept { return age; } Duration getLastDataDuration() const noexcept { return dataDuration; } Duration getLastAmplitudeDuration() const noexcept { return amplitudeDuration; } @@ -314,7 +314,7 @@ private: LEAK_DETECTOR(Voice); }; -constexpr bool sisterVoices(const Voice* lhs, const Voice* rhs) +inline bool sisterVoices(const Voice* lhs, const Voice* rhs) { return lhs->getAge() == rhs->getAge() && lhs->getTriggerNumber() == rhs->getTriggerNumber()