From 23606b20f70d33436c0e9ff4ea948eed23d7ea4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20S=C3=BC=C3=9Fenbach?= <asuessenbach@nvidia.com>
Date: Mon, 28 Aug 2023 13:30:00 +0200
Subject: [PATCH] Guard vk::raii names in vulkan.cppm just as in
 vulkan_raii.hpp. (#1650)

---
 VulkanHppGenerator.cpp | 2 ++
 vulkan/vulkan.cppm     | 6 ++++--
 vulkan/vulkansc.cppm   | 6 ++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp
index 9c8b530..14740f2 100644
--- a/VulkanHppGenerator.cpp
+++ b/VulkanHppGenerator.cpp
@@ -725,9 +725,11 @@ export namespace VULKAN_HPP_NAMESPACE
 {
   ${usings}
 
+#if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE ) && !defined( VULKAN_HPP_NO_EXCEPTIONS )
   namespace VULKAN_HPP_RAII_NAMESPACE {
     ${raiiUsings}
   } // namespace VULKAN_HPP_RAII_NAMESPACE
+#endif
 } // namespace VULKAN_HPP_NAMESPACE
 )";
 
diff --git a/vulkan/vulkan.cppm b/vulkan/vulkan.cppm
index d123b33..78d2975 100644
--- a/vulkan/vulkan.cppm
+++ b/vulkan/vulkan.cppm
@@ -2929,6 +2929,7 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::isObsoletedExtension;
   using VULKAN_HPP_NAMESPACE::isPromotedExtension;
 
+#if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE ) && !defined( VULKAN_HPP_NO_EXCEPTIONS )
   namespace VULKAN_HPP_RAII_NAMESPACE
   {
     //======================
@@ -3027,10 +3028,10 @@ export namespace VULKAN_HPP_NAMESPACE
     //=== VK_NV_device_generated_commands ===
     using VULKAN_HPP_RAII_NAMESPACE::IndirectCommandsLayoutNV;
 
-#if defined( VK_USE_PLATFORM_FUCHSIA )
+#  if defined( VK_USE_PLATFORM_FUCHSIA )
     //=== VK_FUCHSIA_buffer_collection ===
     using VULKAN_HPP_RAII_NAMESPACE::BufferCollectionFUCHSIA;
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
+#  endif /*VK_USE_PLATFORM_FUCHSIA*/
 
     //=== VK_EXT_opacity_micromap ===
     using VULKAN_HPP_RAII_NAMESPACE::MicromapEXT;
@@ -3043,4 +3044,5 @@ export namespace VULKAN_HPP_NAMESPACE
     using VULKAN_HPP_RAII_NAMESPACE::ShaderEXTs;
 
   }  // namespace VULKAN_HPP_RAII_NAMESPACE
+#endif
 }  // namespace VULKAN_HPP_NAMESPACE
diff --git a/vulkan/vulkansc.cppm b/vulkan/vulkansc.cppm
index 70fea23..dffb713 100644
--- a/vulkan/vulkansc.cppm
+++ b/vulkan/vulkansc.cppm
@@ -1403,6 +1403,7 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::isObsoletedExtension;
   using VULKAN_HPP_NAMESPACE::isPromotedExtension;
 
+#if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE ) && !defined( VULKAN_HPP_NO_EXCEPTIONS )
   namespace VULKAN_HPP_RAII_NAMESPACE
   {
     //======================
@@ -1471,10 +1472,11 @@ export namespace VULKAN_HPP_NAMESPACE
     //=== VK_EXT_debug_utils ===
     using VULKAN_HPP_RAII_NAMESPACE::DebugUtilsMessengerEXT;
 
-#if defined( VK_USE_PLATFORM_SCI )
+#  if defined( VK_USE_PLATFORM_SCI )
     //=== VK_NV_external_sci_sync2 ===
     using VULKAN_HPP_RAII_NAMESPACE::SemaphoreSciSyncPoolNV;
-#endif /*VK_USE_PLATFORM_SCI*/
+#  endif /*VK_USE_PLATFORM_SCI*/
 
   }  // namespace VULKAN_HPP_RAII_NAMESPACE
+#endif
 }  // namespace VULKAN_HPP_NAMESPACE