summaryrefslogtreecommitdiff
path: root/src/storage
diff options
context:
space:
mode:
authorMax Kellermann <max@musicpd.org>2020-05-30 14:05:18 +0200
committerMax Kellermann <max@musicpd.org>2020-05-30 14:05:18 +0200
commitf20b9278585d0f11d631ca05eb8bf16ed33307e3 (patch)
treebe464657e1e348d36e6f21e90490b06f8c9ba304 /src/storage
parente4dad42ca123b9f0f987218c68c42422d6735c0a (diff)
parent1008d5f67c030efdcc1a214ee4a359564fef5932 (diff)
Merge branch 'v0.21.x'
Diffstat (limited to 'src/storage')
-rw-r--r--src/storage/StorageState.cxx9
1 files changed, 8 insertions, 1 deletions
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: "