From cc3549ec5881d112ef6d0e6b43e5f54d45517187 Mon Sep 17 00:00:00 2001 From: asuessenbach Date: Mon, 4 Oct 2021 11:08:19 +0200 Subject: [PATCH] Change 32-bit test in ArrayWrapper1D to using VK_USE_64_BIT_PTR_DEFINES. --- VulkanHppGenerator.cpp | 3 ++- vulkan/vulkan.hpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp index 66c84dd..bb64e5d 100644 --- a/VulkanHppGenerator.cpp +++ b/VulkanHppGenerator.cpp @@ -15397,7 +15397,8 @@ int main( int argc, char ** argv ) : std::array( data ) {} -#if defined( _WIN32 ) && !defined( _WIN64 ) +#if ( VK_USE_64_BIT_PTR_DEFINES == 0 ) + // on 32 bit compiles, needs overloads on index type int to resolve ambiguities VULKAN_HPP_CONSTEXPR T const & operator[]( int index ) const VULKAN_HPP_NOEXCEPT { return std::array::operator[]( index ); diff --git a/vulkan/vulkan.hpp b/vulkan/vulkan.hpp index c52e13b..022059c 100644 --- a/vulkan/vulkan.hpp +++ b/vulkan/vulkan.hpp @@ -669,7 +669,8 @@ namespace VULKAN_HPP_NAMESPACE VULKAN_HPP_CONSTEXPR ArrayWrapper1D( std::array const & data ) VULKAN_HPP_NOEXCEPT : std::array( data ) {} -#if defined( _WIN32 ) && !defined( _WIN64 ) +#if ( VK_USE_64_BIT_PTR_DEFINES == 0 ) + // on 32 bit compiles, needs overloads on index type int to resolve ambiguities VULKAN_HPP_CONSTEXPR T const & operator[]( int index ) const VULKAN_HPP_NOEXCEPT { return std::array::operator[]( index );