From d852225d2acb5289f94486e66ed8805273b8f480 Mon Sep 17 00:00:00 2001
From: Sharadh Rajaraman <r.sharadh@outlook.sg>
Date: Tue, 7 Jul 2026 22:03:22 +0100
Subject: [PATCH] Fix module warning suppression order for Windows
 clang/clang-cl

---
 generator/snippets/CppmTemplate.hpp      | 14 +++++++-------
 generator/snippets/VideoCppmTemplate.hpp | 14 +++++++-------
 vulkan/vulkan.cppm                       | 14 +++++++-------
 vulkan/vulkan_video.cppm                 | 14 +++++++-------
 4 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/generator/snippets/CppmTemplate.hpp b/generator/snippets/CppmTemplate.hpp
index 7a3532c51..7ca66c073 100644
--- a/generator/snippets/CppmTemplate.hpp
+++ b/generator/snippets/CppmTemplate.hpp
@@ -27,12 +27,12 @@ export import std;
 
 VULKAN_HPP_STATIC_ASSERT( VK_HEADER_VERSION == ${headerVersion}, "Wrong VK_HEADER_VERSION!" );
 
-#if defined(_MSC_VER)
-#  pragma warning(push)
-#  pragma warning(disable : 5244)
-#elif defined(__clang__)
+#if defined(__clang__)
 #  pragma clang diagnostic push
 #  pragma clang diagnostic ignored "-Winclude-angled-in-module-purview"
+#elif defined(_MSC_VER)
+#  pragma warning(push)
+#  pragma warning(disable : 5244)
 #elif defined(__GNUC__)
 #endif
 
@@ -43,10 +43,10 @@ VULKAN_HPP_STATIC_ASSERT( VK_HEADER_VERSION == ${headerVersion}, "Wrong VK_HEADE
 #include <vulkan/${api}_raii.hpp>
 #include <vulkan/${api}_shared.hpp>
 
-#if defined(_MSC_VER)
-#  pragma warning(pop)
-#elif defined(__clang__)
+#if defined(__clang__)
 #  pragma clang diagnostic pop
+#elif defined(_MSC_VER)
+#  pragma warning(pop)
 #elif defined(__GNUC__)
 #endif
 
diff --git a/generator/snippets/VideoCppmTemplate.hpp b/generator/snippets/VideoCppmTemplate.hpp
index 7224119ba..db665f588 100644
--- a/generator/snippets/VideoCppmTemplate.hpp
+++ b/generator/snippets/VideoCppmTemplate.hpp
@@ -17,20 +17,20 @@ export module vulkan_video;
 
 import vulkan;
 
-#if defined(_MSC_VER)
-#  pragma warning(push)
-#  pragma warning(disable : 5244)
-#elif defined(__clang__)
+#if defined(__clang__)
 #  pragma clang diagnostic push
 #  pragma clang diagnostic ignored "-Winclude-angled-in-module-purview"
+#elif defined(_MSC_VER)
+#  pragma warning(push)
+#  pragma warning(disable : 5244)
 #elif defined(__GNUC__)
 #endif
 
 #include <vulkan/vulkan_video.hpp>
 
-#if defined(_MSC_VER)
-#  pragma warning(pop)
-#elif defined(__clang__)
+#if defined(__clang__)
 #  pragma clang diagnostic pop
+#elif defined(_MSC_VER)
+#  pragma warning(pop)
 #elif defined(__GNUC__)
 #endif
diff --git a/vulkan/vulkan.cppm b/vulkan/vulkan.cppm
index 20b7028c7..03206757a 100644
--- a/vulkan/vulkan.cppm
+++ b/vulkan/vulkan.cppm
@@ -29,12 +29,12 @@ export import std;
 
 VULKAN_HPP_STATIC_ASSERT( VK_HEADER_VERSION == 352, "Wrong VK_HEADER_VERSION!" );
 
-#if defined( _MSC_VER )
-#  pragma warning( push )
-#  pragma warning( disable : 5244 )
-#elif defined( __clang__ )
+#if defined( __clang__ )
 #  pragma clang diagnostic push
 #  pragma clang diagnostic ignored "-Winclude-angled-in-module-purview"
+#elif defined( _MSC_VER )
+#  pragma warning( push )
+#  pragma warning( disable : 5244 )
 #elif defined( __GNUC__ )
 #endif
 
@@ -45,10 +45,10 @@ VULKAN_HPP_STATIC_ASSERT( VK_HEADER_VERSION == 352, "Wrong VK_HEADER_VERSION!" )
 #include <vulkan/vulkan_raii.hpp>
 #include <vulkan/vulkan_shared.hpp>
 
-#if defined( _MSC_VER )
-#  pragma warning( pop )
-#elif defined( __clang__ )
+#if defined( __clang__ )
 #  pragma clang diagnostic pop
+#elif defined( _MSC_VER )
+#  pragma warning( pop )
 #elif defined( __GNUC__ )
 #endif
 
diff --git a/vulkan/vulkan_video.cppm b/vulkan/vulkan_video.cppm
index e03c9b872..8c58f166c 100644
--- a/vulkan/vulkan_video.cppm
+++ b/vulkan/vulkan_video.cppm
@@ -53,20 +53,20 @@ export module vulkan_video;
 
 import vulkan;
 
-#if defined( _MSC_VER )
-#  pragma warning( push )
-#  pragma warning( disable : 5244 )
-#elif defined( __clang__ )
+#if defined( __clang__ )
 #  pragma clang diagnostic push
 #  pragma clang diagnostic ignored "-Winclude-angled-in-module-purview"
+#elif defined( _MSC_VER )
+#  pragma warning( push )
+#  pragma warning( disable : 5244 )
 #elif defined( __GNUC__ )
 #endif
 
 #include <vulkan/vulkan_video.hpp>
 
-#if defined( _MSC_VER )
-#  pragma warning( pop )
-#elif defined( __clang__ )
+#if defined( __clang__ )
 #  pragma clang diagnostic pop
+#elif defined( _MSC_VER )
+#  pragma warning( pop )
 #elif defined( __GNUC__ )
 #endif