From 237d51d47806212eb1daa5387cadf7c521e8cca9 Mon Sep 17 00:00:00 2001
From: mocabe <hisa.mocabe@gmail.com>
Date: Thu, 25 Jun 2020 01:45:35 +0900
Subject: [PATCH 1/2] [HPP] Remove const and noexcept from string conversion
 operators of ArrayWrapper1D

---
 VulkanHppGenerator.cpp | 4 ++--
 vulkan/vulkan.hpp      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp
index e6e40ba..9f866ce 100644
--- a/VulkanHppGenerator.cpp
+++ b/VulkanHppGenerator.cpp
@@ -6943,14 +6943,14 @@ int main( int argc, char ** argv )
     }
 
     template <typename B = T, typename std::enable_if<std::is_same<B, char>::value, int>::type = 0>
-    operator std::string const () const VULKAN_HPP_NOEXCEPT
+    operator std::string() const
     {
       return std::string( this->data() );
     }
 
 #if 17 <= VULKAN_HPP_CPP_VERSION
     template <typename B = T, typename std::enable_if<std::is_same<B, char>::value, int>::type = 0>
-    operator std::string_view const () const VULKAN_HPP_NOEXCEPT
+    operator std::string_view() const
     {
       return std::string_view( this->data() );
     }
diff --git a/vulkan/vulkan.hpp b/vulkan/vulkan.hpp
index 19bae6a..7449c12 100644
--- a/vulkan/vulkan.hpp
+++ b/vulkan/vulkan.hpp
@@ -365,14 +365,14 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     template <typename B = T, typename std::enable_if<std::is_same<B, char>::value, int>::type = 0>
-    operator std::string const() const VULKAN_HPP_NOEXCEPT
+    operator std::string() const
     {
       return std::string( this->data() );
     }
 
 #if 17 <= VULKAN_HPP_CPP_VERSION
     template <typename B = T, typename std::enable_if<std::is_same<B, char>::value, int>::type = 0>
-    operator std::string_view const() const VULKAN_HPP_NOEXCEPT
+    operator std::string_view() const
     {
       return std::string_view( this->data() );
     }

From 9aa21f85fcf9fae12ab607c5dea8addf501716ea Mon Sep 17 00:00:00 2001
From: mocabe <hisa.mocabe@gmail.com>
Date: Thu, 2 Jul 2020 12:16:14 +0900
Subject: [PATCH 2/2] [samples] Fix compilation of
 InstanceLayerExtensionProperties

---
 .../InstanceLayerExtensionProperties.cpp                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/InstanceLayerExtensionProperties/InstanceLayerExtensionProperties.cpp b/samples/InstanceLayerExtensionProperties/InstanceLayerExtensionProperties.cpp
index 3e3bf6c..1bf4e3e 100644
--- a/samples/InstanceLayerExtensionProperties/InstanceLayerExtensionProperties.cpp
+++ b/samples/InstanceLayerExtensionProperties/InstanceLayerExtensionProperties.cpp
@@ -49,7 +49,7 @@ int main( int /*argc*/, char ** /*argv*/ )
     for ( auto const & layerProperty : layerProperties )
     {
       std::vector<vk::ExtensionProperties> extensionProperties =
-        vk::enumerateInstanceExtensionProperties( std::string( layerProperty.layerName ) );
+        vk::enumerateInstanceExtensionProperties( vk::Optional<const std::string>( layerProperty.layerName ) );
       propertyData.push_back( PropertyData( layerProperty, extensionProperties ) );
     }