From 7e9f9b6aac1feffc8ffbc91a5108dc95bd753619 Mon Sep 17 00:00:00 2001 From: Sho Ikeda Date: Thu, 18 Jun 2020 23:36:59 +0900 Subject: [PATCH] Fix the #if condition of ResultValue. --- VulkanHppGenerator.cpp | 4 +++- vulkan/vulkan.hpp | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp index 1bdf6ad..d77773d 100644 --- a/VulkanHppGenerator.cpp +++ b/VulkanHppGenerator.cpp @@ -7951,7 +7951,7 @@ namespace std #endif }; -#if !defined(VULKAN_HPP_DISABLE_IMPLICIT_RESULT_VALUE_CAST) +#if !defined(VULKAN_HPP_NO_SMART_HANDLE) template struct ResultValue> { @@ -7969,6 +7969,7 @@ namespace std operator std::tuple&>() VULKAN_HPP_NOEXCEPT { return std::tuple&>(result, value); } +#if !defined(VULKAN_HPP_DISABLE_IMPLICIT_RESULT_VALUE_CAST) operator UniqueHandle& () & VULKAN_HPP_NOEXCEPT { return value; @@ -7978,6 +7979,7 @@ namespace std { return std::move(value); } +#endif }; #endif diff --git a/vulkan/vulkan.hpp b/vulkan/vulkan.hpp index f280a47..19e82ed 100644 --- a/vulkan/vulkan.hpp +++ b/vulkan/vulkan.hpp @@ -15883,7 +15883,7 @@ namespace VULKAN_HPP_NAMESPACE #endif }; -#if !defined( VULKAN_HPP_DISABLE_IMPLICIT_RESULT_VALUE_CAST ) +#if !defined( VULKAN_HPP_NO_SMART_HANDLE ) template struct ResultValue> { @@ -15904,6 +15904,7 @@ namespace VULKAN_HPP_NAMESPACE return std::tuple &>( result, value ); } +# if !defined( VULKAN_HPP_DISABLE_IMPLICIT_RESULT_VALUE_CAST ) operator UniqueHandle &() & VULKAN_HPP_NOEXCEPT { return value; @@ -15913,6 +15914,7 @@ namespace VULKAN_HPP_NAMESPACE { return std::move( value ); } +# endif }; #endif