pcm/SampleFormat: workaround for GCC 4.9 "constexpr" bug

GCC 4.9 has incomplete C++14 support. Specifically, it doesn't allow switch/case in "constexpr" functions.

pcm/SampleFormat: workaround for GCC 4.9 "constexpr" bug
a9316863 · Max Kellermann · 5bd322bd · a9316863 · a9316863
Commit a9316863 authored Jan 27, 2017 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

NEWS NEWS +1 -0

SampleFormat.hxx src/pcm/SampleFormat.hxx +8 -2

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.20.4 (not yet released)
+* workaround for GCC 4.9 "constexpr" bug

 ver 0.20.3 (2017/01/25)
 * protocol

--- a/src/pcm/SampleFormat.hxx
+++ b/src/pcm/SampleFormat.hxx
@@ -64,7 +64,10 @@ enum class SampleFormat : uint8_t {
 /**
 * Checks whether the sample format is valid.
 */
-static constexpr inline bool
+#if !GCC_OLDER_THAN(5,0)
+constexpr
+#endif
+static inline bool
 audio_valid_sample_format(SampleFormat format)
 {
 	switch (format) {
@@ -83,7 +86,10 @@ audio_valid_sample_format(SampleFormat format)
 	return false;
 }

-static constexpr inline unsigned
+#if !GCC_OLDER_THAN(5,0)
+constexpr
+#endif
+static inline unsigned
 sample_format_size(SampleFormat format)
 {
 	switch (format) {