mirror of
https://github.com/crystalidea/qt6windows7.git
synced 2025-07-04 00:05:25 +08:00
34 lines
1.4 KiB
Diff
34 lines
1.4 KiB
Diff
From 4a6d29420041e1f0a14450853887226ff838b917 Mon Sep 17 00:00:00 2001
|
|
From: Laszlo Agocs <laszlo.agocs@qt.io>
|
|
Date: Mon, 24 Oct 2022 15:11:30 +0200
|
|
Subject: [PATCH] vkmemalloc: Disable more warnings
|
|
|
|
Change-Id: Ifedd263cb39ebad6babdab7687a22ad23f2c9471
|
|
---
|
|
src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h b/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h
|
|
index 18081839c0..1b27eeac16 100644
|
|
--- a/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h
|
|
+++ b/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h
|
|
@@ -2570,11 +2570,15 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString(
|
|
#pragma GCC diagnostic ignored "-Wunused-variable"
|
|
#pragma GCC diagnostic ignored "-Wunused-parameter"
|
|
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
|
|
+#pragma GCC diagnostic ignored "-Wparentheses"
|
|
+#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
|
|
#elif defined(__clang__)
|
|
#pragma clang diagnostic push
|
|
#pragma clang diagnostic ignored "-Wunused-variable"
|
|
#pragma clang diagnostic ignored "-Wunused-parameter"
|
|
#pragma clang diagnostic ignored "-Wmissing-field-initializers"
|
|
+#pragma clang diagnostic ignored "-Wparentheses"
|
|
+#pragma clang diagnostic ignored "-Wimplicit-fallthrough"
|
|
#if defined(__APPLE__)
|
|
#pragma clang diagnostic ignored "-Wnullability-completeness"
|
|
#endif
|
|
--
|
|
2.36.1.windows.1
|
|
|