[Fix] Compile fix.

manxorist · manxorist · commit 1efc9f9b27cd · 2024-12-19T09:11:38.000Z
git-svn-id: https://source.openmpt.org/svn/openmpt/trunk/OpenMPT@22573 56274372-70c3-4bfc-bfc3-4c3a0b034d27
diff --git a/soundlib/InstrumentExtensions.cpp b/soundlib/InstrumentExtensions.cpp
@@ -183,7 +183,7 @@ struct PropertyWriterReleaseNode
 struct PropertyWriterEnvelopeBase
 {
 	PropertyWriterEnvelopeBase(uint32 nodes, EnvelopeType type) : nodes{nodes}, type{type} {};
-	static constexpr bool IsPropertyNeeded(const ModInstrument&) noexcept
+	static bool IsPropertyNeeded(const ModInstrument&) noexcept
 	{
 		return true;
 	}
@@ -242,7 +242,7 @@ struct PropertyWriterEnvelopeValues : PropertyWriterEnvelopeBase
 
 struct PropertyWriterPitchTempoLock
 {
-	static constexpr bool IsPropertyNeeded(const ModInstrument &ins) noexcept { return ModInstrument{}.pitchToTempoLock != ins.pitchToTempoLock; }
+	static bool IsPropertyNeeded(const ModInstrument &ins) noexcept { return ModInstrument{}.pitchToTempoLock != ins.pitchToTempoLock; }
 	static constexpr uint16 Size() noexcept { return sizeof(uint16le); }
 	PropertyWriterPitchTempoLock(bool intPart) : m_intPart{intPart} {}
 	void Write(std::ostream &file, const ModInstrument &ins)

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ struct PropertyWriterReleaseNode`
`183`	`183`	`struct PropertyWriterEnvelopeBase`
`184`	`184`	`{`
`185`	`185`	`PropertyWriterEnvelopeBase(uint32 nodes, EnvelopeType type) : nodes{nodes}, type{type} {};`
`186`		`- static constexpr bool IsPropertyNeeded(const ModInstrument&) noexcept`
	`186`	`+ static bool IsPropertyNeeded(const ModInstrument&) noexcept`
`187`	`187`	`{`
`188`	`188`	`return true;`
`189`	`189`	`}`
`@@ -242,7 +242,7 @@ struct PropertyWriterEnvelopeValues : PropertyWriterEnvelopeBase`
`242`	`242`
`243`	`243`	`struct PropertyWriterPitchTempoLock`
`244`	`244`	`{`
`245`		`- static constexpr bool IsPropertyNeeded(const ModInstrument &ins) noexcept { return ModInstrument{}.pitchToTempoLock != ins.pitchToTempoLock; }`
	`245`	`+ static bool IsPropertyNeeded(const ModInstrument &ins) noexcept { return ModInstrument{}.pitchToTempoLock != ins.pitchToTempoLock; }`
`246`	`246`	`static constexpr uint16 Size() noexcept { return sizeof(uint16le); }`
`247`	`247`	`PropertyWriterPitchTempoLock(bool intPart) : m_intPart{intPart} {}`
`248`	`248`	`void Write(std::ostream &file, const ModInstrument &ins)`