From 68b11f1e9058f4a7e80f0a643ed836e6bfbd909b Mon Sep 17 00:00:00 2001 From: mocabe Date: Wed, 30 Oct 2019 00:00:03 +0900 Subject: [PATCH] Disable CTAD on ArrayProxy's constructors (#405) * Disable CTAD on ArrayProxy's reference constructor * Disable CTAD on ArrayProxy's initializer_list ctor --- VulkanHppGenerator.cpp | 4 ++-- vulkan/vulkan.hpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp index a883982..cbcd3e7 100644 --- a/VulkanHppGenerator.cpp +++ b/VulkanHppGenerator.cpp @@ -4383,7 +4383,7 @@ int main( int argc, char **argv ) , m_ptr(nullptr) {} - ArrayProxy(T & ptr) VULKAN_HPP_NOEXCEPT + ArrayProxy(typename std::remove_reference::type & ptr) VULKAN_HPP_NOEXCEPT : m_count(1) , m_ptr(&ptr) {} @@ -4417,7 +4417,7 @@ int main( int argc, char **argv ) , m_ptr(data.data()) {} - ArrayProxy(std::initializer_list const& data) VULKAN_HPP_NOEXCEPT + ArrayProxy(std::initializer_list::type> const& data) VULKAN_HPP_NOEXCEPT : m_count(static_cast(data.end() - data.begin())) , m_ptr(data.begin()) {} diff --git a/vulkan/vulkan.hpp b/vulkan/vulkan.hpp index af8a591..a33ec60 100644 --- a/vulkan/vulkan.hpp +++ b/vulkan/vulkan.hpp @@ -168,7 +168,7 @@ namespace VULKAN_HPP_NAMESPACE , m_ptr(nullptr) {} - ArrayProxy(T & ptr) VULKAN_HPP_NOEXCEPT + ArrayProxy(typename std::remove_reference::type & ptr) VULKAN_HPP_NOEXCEPT : m_count(1) , m_ptr(&ptr) {} @@ -202,7 +202,7 @@ namespace VULKAN_HPP_NAMESPACE , m_ptr(data.data()) {} - ArrayProxy(std::initializer_list const& data) VULKAN_HPP_NOEXCEPT + ArrayProxy(std::initializer_list::type> const& data) VULKAN_HPP_NOEXCEPT : m_count(static_cast(data.end() - data.begin())) , m_ptr(data.begin()) {}