From d0a42307b6fdeed27b5fcd33a2b5aceb3438d8b9 Mon Sep 17 00:00:00 2001 From: asuessenbach Date: Tue, 16 Jun 2020 13:44:40 +0200 Subject: [PATCH] Resolve deprecated-warnings on cpp_type. --- Vulkan-Headers | 2 +- VulkanHppGenerator.cpp | 2 +- vulkan/vulkan.hpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Vulkan-Headers b/Vulkan-Headers index 9d2dfca..f315245 160000 --- a/Vulkan-Headers +++ b/Vulkan-Headers @@ -1 +1 @@ -Subproject commit 9d2dfca53b754dd3ab916899fed567a5290c30aa +Subproject commit f31524575668c6c483356bd54ca974590e31be8e diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp index 6be28e1..57c6dae 100644 --- a/VulkanHppGenerator.cpp +++ b/VulkanHppGenerator.cpp @@ -1807,7 +1807,7 @@ void VulkanHppGenerator::appendEnums( std::string & str ) const { str += R"( template - struct VULKAN_HPP_DEPRECATED("vk::cpp_type is deprecated. Use vk::CppType instead.") cpp_type + struct cpp_type {}; )"; } diff --git a/vulkan/vulkan.hpp b/vulkan/vulkan.hpp index 41c04e0..e202a1a 100644 --- a/vulkan/vulkan.hpp +++ b/vulkan/vulkan.hpp @@ -52,7 +52,7 @@ # include #endif -static_assert( VK_HEADER_VERSION == 143, "Wrong VK_HEADER_VERSION!" ); +static_assert( VK_HEADER_VERSION == 144, "Wrong VK_HEADER_VERSION!" ); // 32-bit vulkan is not typesafe for handles, so don't allow copy constructors on this platform by default. // To enable this feature on 32-bit platforms please define VULKAN_HPP_TYPESAFE_CONVERSION @@ -7544,7 +7544,7 @@ namespace VULKAN_HPP_NAMESPACE } template - struct VULKAN_HPP_DEPRECATED( "vk::cpp_type is deprecated. Use vk::CppType instead." ) cpp_type + struct cpp_type {}; enum class PeerMemoryFeatureFlagBits : VkPeerMemoryFeatureFlags