Merge pull request #1088 from asuessenbach/ArrayWrapper1D

Change 32-bit test in ArrayWrapper1D to using VK_USE_64_BIT_PTR_DEFINES.
This commit is contained in:
Andreas Süßenbach 2021-10-04 12:09:11 +02:00 committed by GitHub
commit 5df37b6f43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions

View File

@ -15397,7 +15397,8 @@ int main( int argc, char ** argv )
: std::array<T, N>( 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<T, N>::operator[]( index );

View File

@ -669,7 +669,8 @@ namespace VULKAN_HPP_NAMESPACE
VULKAN_HPP_CONSTEXPR ArrayWrapper1D( std::array<T, N> const & data ) VULKAN_HPP_NOEXCEPT : std::array<T, N>( 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<T, N>::operator[]( index );