Moved import std macro guard to .cppm file itself

KhronosGroup · Aug 14, 2024 · 925f6ed · 925f6ed
1 parent 77325c8
commit 925f6ed
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp
@@ -794,6 +794,11 @@ void VulkanHppGenerator::generateCppModuleFile() const
 
 module;
 
+#include <vulkan/${api}_hpp_macros.hpp>
+#if defined( VULKAN_HPP_STD_MODULE )
+import VULKAN_HPP_STD_MODULE;
+import VULKAN_HPP_STD_COMPAT_MODULE;
+#endif
 #include <vulkan/${api}.hpp>
 #include <vulkan/${api}_extension_inspection.hpp>
 #include <vulkan/${api}_format_traits.hpp>

diff --git a/snippets/includes.hpp b/snippets/includes.hpp
@@ -1,16 +1,12 @@
-#include <vulkan/vulkan_hpp_macros.hpp>
-
 #if !defined( VULKAN_HPP_STD_MODULE )
 # include <algorithm>
 # include <array>     // ArrayWrapperND
 # include <string.h>  // strnlen
 # include <string>    // std::string
 # include <utility>   // std::exchange
-#else
-import VULKAN_HPP_STD_MODULE;
-import VULKAN_HPP_STD_COMPAT_MODULE;
 #endif
 #include <vulkan/${vulkan_h}>
+#include <vulkan/vulkan_hpp_macros.hpp>
 
 #if 17 <= VULKAN_HPP_CPP_VERSION && !defined( VULKAN_HPP_STD_MODULE )
 #  include <string_view>

diff --git a/vulkan/vulkan.cppm b/vulkan/vulkan.cppm
@@ -10,6 +10,11 @@
 
 module;
 
+#include <vulkan/vulkan_hpp_macros.hpp>
+#if defined( VULKAN_HPP_STD_MODULE )
+import VULKAN_HPP_STD_MODULE;
+import VULKAN_HPP_STD_COMPAT_MODULE;
+#endif
 #include <vulkan/vulkan.hpp>
 #include <vulkan/vulkan_extension_inspection.hpp>
 #include <vulkan/vulkan_format_traits.hpp>

diff --git a/vulkan/vulkan.hpp b/vulkan/vulkan.hpp
@@ -8,19 +8,15 @@
 #ifndef VULKAN_HPP
 #define VULKAN_HPP
 
-#include <vulkan/vulkan_hpp_macros.hpp>
-
 #if !defined( VULKAN_HPP_STD_MODULE )
 #  include <algorithm>
 #  include <array>     // ArrayWrapperND
 #  include <string.h>  // strnlen
 #  include <string>    // std::string
 #  include <utility>   // std::exchange
-#else
-import VULKAN_HPP_STD_MODULE;
-import VULKAN_HPP_STD_COMPAT_MODULE;
 #endif
 #include <vulkan/vulkan.h>
+#include <vulkan/vulkan_hpp_macros.hpp>
 
 #if 17 <= VULKAN_HPP_CPP_VERSION && !defined( VULKAN_HPP_STD_MODULE )
 #  include <string_view>