Skip to content

M
mpd
Commit a9316863 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

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.
parent 5bd322bd
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 2 deletions
NEWS
View file @ a9316863
ver 0.20.4 (not yet released) ver 0.20.4 (not yet released)
* workaround for GCC 4.9 "constexpr" bug
ver 0.20.3 (2017/01/25) ver 0.20.3 (2017/01/25)
* protocol * protocol
......
src/pcm/SampleFormat.hxx
View file @ a9316863
...@@ -64,7 +64,10 @@ enum class SampleFormat : uint8_t { ...@@ -64,7 +64,10 @@ enum class SampleFormat : uint8_t {
/** /**
* Checks whether the sample format is valid. * 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) audio_valid_sample_format(SampleFormat format)
{ {
switch (format) { switch (format) {
...@@ -83,7 +86,10 @@ audio_valid_sample_format(SampleFormat format) ...@@ -83,7 +86,10 @@ audio_valid_sample_format(SampleFormat format)
return false; return false;
} }
static constexpr inline unsigned #if !GCC_OLDER_THAN(5,0)
constexpr
#endif
static inline unsigned
sample_format_size(SampleFormat format) sample_format_size(SampleFormat format)
{ {
switch (format) { switch (format) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment