From 3a946ddfa18ce428a9ef5ad1ebaffb0e6632684f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20S=C3=BC=C3=9Fenbach?= Date: Fri, 2 Feb 2024 21:22:52 +0100 Subject: [PATCH] Specify std::min to work on type size_t for copy operations in struct constructors. (#1782) --- VulkanHppGenerator.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp index 15e5899..ccd0a59 100644 --- a/VulkanHppGenerator.cpp +++ b/VulkanHppGenerator.cpp @@ -10678,7 +10678,7 @@ std::string VulkanHppGenerator::generateStructConstructorsEnhanced( std::pairlenExpressions[0] == "null-terminated" ) - ? ( "std::min( " + mit->name + "_.size(), " + mit->arraySizes[0] + " )" ) + ? ( "std::min( " + mit->name + "_.size(), " + mit->arraySizes[0] + " )" ) : ( mit->lenExpressions[0] + " * sizeof( " + argumentType + " )" ); copyOps += replaceWithMap( copyOpsTemplate, { { "arraySize", mit->arraySizes[0] }, @@ -11325,7 +11325,7 @@ std::string VulkanHppGenerator::generateStructSetter( std::string const & struct ${structureName} & set${ArrayName}( std::string const & ${arrayName}_ ) VULKAN_HPP_NOEXCEPT { VULKAN_HPP_ASSERT( ${arrayName}_.size() < ${arraySize} ); - strncpy( ${arrayName}, ${arrayName}_.data(), std::min( ${arrayName}_.size(), ${arraySize} ); + strncpy( ${arrayName}, ${arrayName}_.data(), std::min( ${arrayName}_.size(), ${arraySize} ); return *this; } #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/