From 0eb17d3f865bb9e548ef9ad392f202f92bd0e276 Mon Sep 17 00:00:00 2001 From: Krzysztof Kurek Date: Tue, 27 Oct 2020 22:09:14 +0100 Subject: [PATCH] Default Flags' copy functions User-provided copy constructor and copy assignment operators prevent the class' ABI from being trivial. --- VulkanHppGenerator.cpp | 10 ++-------- vulkan/vulkan.hpp | 8 ++------ 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp index 40e0c29..5aba058 100644 --- a/VulkanHppGenerator.cpp +++ b/VulkanHppGenerator.cpp @@ -9725,9 +9725,7 @@ int main( int argc, char ** argv ) : m_mask(static_cast(bit)) {} - VULKAN_HPP_CONSTEXPR Flags(Flags const& rhs) VULKAN_HPP_NOEXCEPT - : m_mask(rhs.m_mask) - {} + VULKAN_HPP_CONSTEXPR Flags(Flags const& rhs) VULKAN_HPP_NOEXCEPT = default; VULKAN_HPP_CONSTEXPR explicit Flags(MaskType flags) VULKAN_HPP_NOEXCEPT : m_mask(flags) @@ -9796,11 +9794,7 @@ int main( int argc, char ** argv ) } // assignment operators - VULKAN_HPP_CONSTEXPR_14 Flags & operator=(Flags const& rhs) VULKAN_HPP_NOEXCEPT - { - m_mask = rhs.m_mask; - return *this; - } + VULKAN_HPP_CONSTEXPR_14 Flags & operator=(Flags const& rhs) VULKAN_HPP_NOEXCEPT = default; VULKAN_HPP_CONSTEXPR_14 Flags & operator|=(Flags const& rhs) VULKAN_HPP_NOEXCEPT { diff --git a/vulkan/vulkan.hpp b/vulkan/vulkan.hpp index 20597ed..18f6696 100644 --- a/vulkan/vulkan.hpp +++ b/vulkan/vulkan.hpp @@ -679,7 +679,7 @@ namespace VULKAN_HPP_NAMESPACE VULKAN_HPP_CONSTEXPR Flags( BitType bit ) VULKAN_HPP_NOEXCEPT : m_mask( static_cast( bit ) ) {} - VULKAN_HPP_CONSTEXPR Flags( Flags const & rhs ) VULKAN_HPP_NOEXCEPT : m_mask( rhs.m_mask ) {} + VULKAN_HPP_CONSTEXPR Flags( Flags const & rhs ) VULKAN_HPP_NOEXCEPT = default; VULKAN_HPP_CONSTEXPR explicit Flags( MaskType flags ) VULKAN_HPP_NOEXCEPT : m_mask( flags ) {} @@ -746,11 +746,7 @@ namespace VULKAN_HPP_NAMESPACE } // assignment operators - VULKAN_HPP_CONSTEXPR_14 Flags & operator=( Flags const & rhs ) VULKAN_HPP_NOEXCEPT - { - m_mask = rhs.m_mask; - return *this; - } + VULKAN_HPP_CONSTEXPR_14 Flags & operator=( Flags const & rhs ) VULKAN_HPP_NOEXCEPT = default; VULKAN_HPP_CONSTEXPR_14 Flags & operator|=( Flags const & rhs ) VULKAN_HPP_NOEXCEPT {