From 3f82338d9feee393f41dfdabed985bacb555efff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20S=C3=BC=C3=9Fenbach?= Date: Wed, 4 Dec 2019 08:34:58 +0100 Subject: [PATCH] Fix ambiguous constructor of ObjectDestroy with vk::NoParent. (#451) Resolves #450 --- VulkanHppGenerator.cpp | 2 +- vulkan/vulkan.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp index 613fd2b..2419b52 100644 --- a/VulkanHppGenerator.cpp +++ b/VulkanHppGenerator.cpp @@ -4629,7 +4629,7 @@ int main( int argc, char **argv ) , m_dispatch( nullptr ) {} - ObjectDestroy( Optional allocationCallbacks = nullptr, Dispatch const &dispatch = VULKAN_HPP_DEFAULT_DISPATCHER ) VULKAN_HPP_NOEXCEPT + ObjectDestroy( Optional allocationCallbacks, Dispatch const &dispatch = VULKAN_HPP_DEFAULT_DISPATCHER ) VULKAN_HPP_NOEXCEPT : m_allocationCallbacks( allocationCallbacks ) , m_dispatch( &dispatch ) {} diff --git a/vulkan/vulkan.hpp b/vulkan/vulkan.hpp index faaf552..dbfd942 100644 --- a/vulkan/vulkan.hpp +++ b/vulkan/vulkan.hpp @@ -2691,7 +2691,7 @@ namespace VULKAN_HPP_NAMESPACE , m_dispatch( nullptr ) {} - ObjectDestroy( Optional allocationCallbacks = nullptr, Dispatch const &dispatch = VULKAN_HPP_DEFAULT_DISPATCHER ) VULKAN_HPP_NOEXCEPT + ObjectDestroy( Optional allocationCallbacks, Dispatch const &dispatch = VULKAN_HPP_DEFAULT_DISPATCHER ) VULKAN_HPP_NOEXCEPT : m_allocationCallbacks( allocationCallbacks ) , m_dispatch( &dispatch ) {}