diff options
| author | Max Kellermann <max@musicpd.org> | 2020-05-30 14:05:18 +0200 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2020-05-30 14:05:18 +0200 |
| commit | f20b9278585d0f11d631ca05eb8bf16ed33307e3 (patch) | |
| tree | be464657e1e348d36e6f21e90490b06f8c9ba304 | |
| parent | e4dad42ca123b9f0f987218c68c42422d6735c0a (diff) | |
| parent | 1008d5f67c030efdcc1a214ee4a359564fef5932 (diff) | |
Merge branch 'v0.21.x'
| -rw-r--r-- | meson.build | 3 | ||||
| -rw-r--r-- | src/db/plugins/ProxyDatabasePlugin.cxx | 10 | ||||
| -rw-r--r-- | src/output/plugins/OpenALOutputPlugin.cxx | 3 | ||||
| -rw-r--r-- | src/storage/StorageState.cxx | 9 |
4 files changed, 18 insertions, 7 deletions
diff --git a/meson.build b/meson.build index 9fd6cad18..09a1b9b6c 100644 --- a/meson.build +++ b/meson.build @@ -43,9 +43,6 @@ common_cxxflags = [ ] test_common_flags = [ - '-Wall', - '-Wextra', - '-Wvla', '-fvisibility=hidden', diff --git a/src/db/plugins/ProxyDatabasePlugin.cxx b/src/db/plugins/ProxyDatabasePlugin.cxx index df62041a8..8bf288834 100644 --- a/src/db/plugins/ProxyDatabasePlugin.cxx +++ b/src/db/plugins/ProxyDatabasePlugin.cxx @@ -494,9 +494,13 @@ ProxyDatabase::Connect() try { CheckError(connection); - if (mpd_connection_cmp_server_version(connection, 0, 19, 0) < 0) - throw FormatRuntimeError("Connect to MPD %s, but this plugin requires at least version 0.19", - mpd_connection_get_server_version(connection)); + if (mpd_connection_cmp_server_version(connection, 0, 19, 0) < 0) { + const unsigned *version = + mpd_connection_get_server_version(connection); + throw FormatRuntimeError("Connect to MPD %u.%u.%u, but this " + "plugin requires at least version 0.19", + version[0], version[1], version[2]); + } if (!password.empty() && !mpd_run_password(connection, password.c_str())) diff --git a/src/output/plugins/OpenALOutputPlugin.cxx b/src/output/plugins/OpenALOutputPlugin.cxx index b69a61881..47ca9df6c 100644 --- a/src/output/plugins/OpenALOutputPlugin.cxx +++ b/src/output/plugins/OpenALOutputPlugin.cxx @@ -29,6 +29,9 @@ #else #include <OpenAL/al.h> #include <OpenAL/alc.h> +/* on macOS, OpenAL is deprecated, but since the user asked to enable + this plugin, let's ignore the compiler warnings */ +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif class OpenALOutput final : AudioOutput { diff --git a/src/storage/StorageState.cxx b/src/storage/StorageState.cxx index a93ed6f28..8d4445dc8 100644 --- a/src/storage/StorageState.cxx +++ b/src/storage/StorageState.cxx @@ -33,9 +33,16 @@ #include "Instance.hxx" #include "Log.hxx" -#include <set> +#ifdef __clang__ +/* ignore -Wcomma due to strange code in boost/array.hpp (in Boost + 1.72) */ +#pragma GCC diagnostic ignored "-Wcomma" +#endif + #include <boost/crc.hpp> +#include <set> + #define MOUNT_STATE_BEGIN "mount_begin" #define MOUNT_STATE_END "mount_end" #define MOUNT_STATE_STORAGE_URI "uri: " |