From cdfb290dc186004bff8f6362c2a6938b1a64430c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20S=C3=BC=C3=9Fenbach?= Date: Fri, 27 Sep 2019 08:59:59 +0200 Subject: [PATCH] Make ConstExpressionArrayCopy::copy() a constexpr with C++14 earliest. (#394) --- VulkanHppGenerator.cpp | 4 ++-- vulkan/vulkan.hpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp index 6939b06..3a7ca08 100644 --- a/VulkanHppGenerator.cpp +++ b/VulkanHppGenerator.cpp @@ -4924,7 +4924,7 @@ static const std::string constExpressionArrayCopy = R"( class ConstExpressionArrayCopy { public: - VULKAN_HPP_CONSTEXPR static void copy(T dst[N], std::array const& src) + VULKAN_HPP_CONSTEXPR_14 static void copy(T dst[N], std::array const& src) { dst[I-1] = src[I-1]; ConstExpressionArrayCopy::copy(dst, src); @@ -4935,7 +4935,7 @@ static const std::string constExpressionArrayCopy = R"( class ConstExpressionArrayCopy { public: - VULKAN_HPP_CONSTEXPR static void copy(T /*dst*/[N], std::array const& /*src*/) {} + VULKAN_HPP_CONSTEXPR_14 static void copy(T /*dst*/[N], std::array const& /*src*/) {} }; )"; diff --git a/vulkan/vulkan.hpp b/vulkan/vulkan.hpp index 5d66ee5..5e94879 100644 --- a/vulkan/vulkan.hpp +++ b/vulkan/vulkan.hpp @@ -2660,7 +2660,7 @@ namespace VULKAN_HPP_NAMESPACE class ConstExpressionArrayCopy { public: - VULKAN_HPP_CONSTEXPR static void copy(T dst[N], std::array const& src) + VULKAN_HPP_CONSTEXPR_14 static void copy(T dst[N], std::array const& src) { dst[I-1] = src[I-1]; ConstExpressionArrayCopy::copy(dst, src); @@ -2671,7 +2671,7 @@ namespace VULKAN_HPP_NAMESPACE class ConstExpressionArrayCopy { public: - VULKAN_HPP_CONSTEXPR static void copy(T /*dst*/[N], std::array const& /*src*/) {} + VULKAN_HPP_CONSTEXPR_14 static void copy(T /*dst*/[N], std::array const& /*src*/) {} }; using Bool32 = uint32_t;