[Fix] Remove more constexpr. Android won't have it.

sagamusix · sagamusix · commit e5d17e653db9 · 2024-12-20T08:23:41.000Z
git-svn-id: https://source.openmpt.org/svn/openmpt/trunk/OpenMPT@22585 56274372-70c3-4bfc-bfc3-4c3a0b034d27
diff --git a/soundlib/ModInstrument.h b/soundlib/ModInstrument.h
@@ -135,13 +135,13 @@ struct ModInstrument
 	}
 
 	// Assign all notes to a given sample.
-	MPT_CONSTEXPR20_FUN void AssignSample(SAMPLEINDEX sample)
+	void AssignSample(SAMPLEINDEX sample)
 	{
 		Keyboard.fill(sample);
 	}
 
 	// Reset note mapping (i.e. every note is mapped to itself)
-	MPT_CONSTEXPR20_FUN void ResetNoteMap()
+	void ResetNoteMap()
 	{
 		std::iota(NoteMap.begin(), NoteMap.end(), static_cast<uint8>(NOTE_MIN));
 	}

Original file line number	Diff line number	Diff line change
`@@ -135,13 +135,13 @@ struct ModInstrument`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`// Assign all notes to a given sample.`
`138`		`- MPT_CONSTEXPR20_FUN void AssignSample(SAMPLEINDEX sample)`
	`138`	`+ void AssignSample(SAMPLEINDEX sample)`
`139`	`139`	`{`
`140`	`140`	`Keyboard.fill(sample);`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`// Reset note mapping (i.e. every note is mapped to itself)`
`144`		`- MPT_CONSTEXPR20_FUN void ResetNoteMap()`
	`144`	`+ void ResetNoteMap()`
`145`	`145`	`{`
`146`	`146`	`std::iota(NoteMap.begin(), NoteMap.end(), static_cast<uint8>(NOTE_MIN));`
`147`	`147`	`}`