mirror of
https://github.com/KhronosGroup/Vulkan-Hpp.git
synced 2024-10-14 16:32:17 +00:00
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:
commit
5df37b6f43
@ -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 );
|
||||
|
@ -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 );
|
||||
|
Loading…
Reference in New Issue
Block a user