oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

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

Browse Source 
GCC 4.9 has incomplete C++14 support.  Specifically, it doesn't allow
switch/case in "constexpr" functions.
This commit is contained in:
Max Kellermann 2017-01-27 11:02:58 +01:00
parent 5bd322bdcf
commit a931686317
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -1,4 +1,5 @@
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

10
src/pcm/SampleFormat.hxx
View File

@ -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)
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) {