mewin/vulkan-hpp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix msvc 2015 issue with operator== being ambigious and incorrect constexpr in ResultValue (#412)

Browse Source
This commit is contained in:
Markus Tavenrath
2019-10-25 13:21:49 +02:00
committed by GitHub
parent 07ed47ab53
commit 3976a4cc75
2 changed files with 50 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
VulkanHppGenerator.cpp
View File

@@ -1045,7 +1045,7 @@ void VulkanHppGenerator::appendDispatchLoaderDynamic(std::string & str)
{
public:
#ifdef VULKAN_HPP_NO_EXCEPTIONS
DynamicLoader() : m_success( false ) VULKAN_HPP_NOEXCEPT
DynamicLoader() VULKAN_HPP_NOEXCEPT : m_success( false )
#else
DynamicLoader() : m_success( false )
#endif
@@ -2479,7 +2479,13 @@ void VulkanHppGenerator::appendStructCompareOperators(std::string & str, std::pa
compareMembers += intro;
if (member.arraySize.empty())
{
compareMembers += "( " + member.name + " == rhs." + member.name + " )";
if (m_bitmaskBits.find(member.type.type) != m_bitmaskBits.end()) {
compareMembers += "vk::operator==( " + member.name + ", " + member.name + " )";
}
else
{
compareMembers += "( " + member.name + " == rhs." + member.name + " )";
}
}
else
{
@@ -5184,7 +5190,7 @@ namespace std
struct ResultValue
{
#ifdef VULKAN_HPP_HAS_NOEXCEPT
ResultValue( Result r, T & v ) VULKAN_HPP_NOEXCEPT(VULKAN_HPP_NOEXCEPT(value(v)))
ResultValue( Result r, T & v ) VULKAN_HPP_NOEXCEPT(VULKAN_HPP_NOEXCEPT(T(v)))
#else
ResultValue( Result r, T & v )
#endif
@@ -5193,7 +5199,7 @@ namespace std
{}
#ifdef VULKAN_HPP_HAS_NOEXCEPT
ResultValue( Result r, T && v ) VULKAN_HPP_NOEXCEPT(VULKAN_HPP_NOEXCEPT(value(std::move(v))))
ResultValue( Result r, T && v ) VULKAN_HPP_NOEXCEPT(VULKAN_HPP_NOEXCEPT(T(std::move(v))))
#else
ResultValue( Result r, T && v )
#endif