From f292158889467d98195193c08196909e5a30bd96 Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Wed, 14 Jul 2021 17:11:27 +0200 Subject: [PATCH] Silence some more clangd warnings --- src/common/serialization/vst3/bstream.cpp | 1 + src/common/serialization/vst3/param-value-queue.h | 2 ++ src/plugin/bridges/vst2.cpp | 1 + src/wine-host/bridges/vst2.cpp | 1 + src/wine-host/bridges/vst3.cpp | 1 + src/wine-host/xdnd-proxy.cpp | 4 ++-- 6 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/common/serialization/vst3/bstream.cpp b/src/common/serialization/vst3/bstream.cpp index a79cb87e..182039a1 100644 --- a/src/common/serialization/vst3/bstream.cpp +++ b/src/common/serialization/vst3/bstream.cpp @@ -188,6 +188,7 @@ tresult PLUGIN_API YaBStream::write(void* buffer, return Steinberg::kResultOk; } +// NOLINTNEXTLINE(bugprone-easily-swappable-parameters) tresult PLUGIN_API YaBStream::seek(int64 pos, int32 mode, int64* result) { switch (mode) { case kIBSeekSet: diff --git a/src/common/serialization/vst3/param-value-queue.h b/src/common/serialization/vst3/param-value-queue.h index 957576ad..05fffa3b 100644 --- a/src/common/serialization/vst3/param-value-queue.h +++ b/src/common/serialization/vst3/param-value-queue.h @@ -27,6 +27,8 @@ // FIXME: When used in a Boost.Containers small vector, GCC somehow complains // that the fields in this class may be uninitialized (during the // deserialization). This warning only shows up during a unity build. +#pragma GCC diagnostic ignored "-Wpragmas" +#pragma clang diagnostic ignored "-Wunknown-warning-option" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" /** diff --git a/src/plugin/bridges/vst2.cpp b/src/plugin/bridges/vst2.cpp index d169c854..1fe1a0c5 100644 --- a/src/plugin/bridges/vst2.cpp +++ b/src/plugin/bridges/vst2.cpp @@ -615,6 +615,7 @@ intptr_t Vst2PluginBridge::dispatch(AEffect* /*plugin*/, } template +// NOLINTNEXTLINE(bugprone-easily-swappable-parameters) void Vst2PluginBridge::do_process(T** inputs, T** outputs, int sample_frames) { // During audio processing we'll write the inputs to shared memory buffers, // and we'll then send this request alongside it with additional information diff --git a/src/wine-host/bridges/vst2.cpp b/src/wine-host/bridges/vst2.cpp index bc22bfe5..963a26ff 100644 --- a/src/wine-host/bridges/vst2.cpp +++ b/src/wine-host/bridges/vst2.cpp @@ -134,6 +134,7 @@ Vst2Bridge& get_bridge_instance(const AEffect* plugin) { } Vst2Bridge::Vst2Bridge(MainContext& main_context, + // NOLINTNEXTLINE(bugprone-easily-swappable-parameters) std::string plugin_dll_path, std::string endpoint_base_dir, pid_t parent_pid) diff --git a/src/wine-host/bridges/vst3.cpp b/src/wine-host/bridges/vst3.cpp index db7928e7..19198723 100644 --- a/src/wine-host/bridges/vst3.cpp +++ b/src/wine-host/bridges/vst3.cpp @@ -86,6 +86,7 @@ Vst3PluginInstance::Vst3PluginInstance( is_initialized(!interfaces.plugin_base) {} Vst3Bridge::Vst3Bridge(MainContext& main_context, + // NOLINTNEXTLINE(bugprone-easily-swappable-parameters) std::string plugin_dll_path, std::string endpoint_base_dir, pid_t parent_pid) diff --git a/src/wine-host/xdnd-proxy.cpp b/src/wine-host/xdnd-proxy.cpp index e252e311..365120f1 100644 --- a/src/wine-host/xdnd-proxy.cpp +++ b/src/wine-host/xdnd-proxy.cpp @@ -279,7 +279,7 @@ void WineXdndProxy::end_xdnd() { // ignore some more warnings here to get clangd to not complain #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wpragmas" -#pragma GCC diagnostic ignored "-Wunknown-warning-option" +#pragma clang diagnostic ignored "-Wunknown-warning-option" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" void WineXdndProxy::run_xdnd_loop() { @@ -657,7 +657,7 @@ std::optional WineXdndProxy::get_xdnd_proxy( // `*last_xdnd_window` to this function #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wpragmas" -#pragma GCC diagnostic ignored "-Wunknown-warning-option" +#pragma clang diagnostic ignored "-Wunknown-warning-option" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" // NOLINTNEXTLINE(bugprone-easily-swappable-parameters)