Fix the #if condition of ResultValue<UniqueHandle>.

This commit is contained in:
Sho Ikeda 2020-06-18 23:36:59 +09:00
parent 8c2d6d7d05
commit 7e9f9b6aac
2 changed files with 6 additions and 2 deletions

View File

@ -7951,7 +7951,7 @@ namespace std
#endif #endif
}; };
#if !defined(VULKAN_HPP_DISABLE_IMPLICIT_RESULT_VALUE_CAST) #if !defined(VULKAN_HPP_NO_SMART_HANDLE)
template <typename Type, typename Dispatch> template <typename Type, typename Dispatch>
struct ResultValue<UniqueHandle<Type,Dispatch>> struct ResultValue<UniqueHandle<Type,Dispatch>>
{ {
@ -7969,6 +7969,7 @@ namespace std
operator std::tuple<Result&, UniqueHandle<Type, Dispatch>&>() VULKAN_HPP_NOEXCEPT { return std::tuple<Result&, UniqueHandle<Type, Dispatch>&>(result, value); } operator std::tuple<Result&, UniqueHandle<Type, Dispatch>&>() VULKAN_HPP_NOEXCEPT { return std::tuple<Result&, UniqueHandle<Type, Dispatch>&>(result, value); }
#if !defined(VULKAN_HPP_DISABLE_IMPLICIT_RESULT_VALUE_CAST)
operator UniqueHandle<Type, Dispatch>& () & VULKAN_HPP_NOEXCEPT operator UniqueHandle<Type, Dispatch>& () & VULKAN_HPP_NOEXCEPT
{ {
return value; return value;
@ -7978,6 +7979,7 @@ namespace std
{ {
return std::move(value); return std::move(value);
} }
#endif
}; };
#endif #endif

View File

@ -15883,7 +15883,7 @@ namespace VULKAN_HPP_NAMESPACE
#endif #endif
}; };
#if !defined( VULKAN_HPP_DISABLE_IMPLICIT_RESULT_VALUE_CAST ) #if !defined( VULKAN_HPP_NO_SMART_HANDLE )
template <typename Type, typename Dispatch> template <typename Type, typename Dispatch>
struct ResultValue<UniqueHandle<Type, Dispatch>> struct ResultValue<UniqueHandle<Type, Dispatch>>
{ {
@ -15904,6 +15904,7 @@ namespace VULKAN_HPP_NAMESPACE
return std::tuple<Result &, UniqueHandle<Type, Dispatch> &>( result, value ); return std::tuple<Result &, UniqueHandle<Type, Dispatch> &>( result, value );
} }
# if !defined( VULKAN_HPP_DISABLE_IMPLICIT_RESULT_VALUE_CAST )
operator UniqueHandle<Type, Dispatch> &() & VULKAN_HPP_NOEXCEPT operator UniqueHandle<Type, Dispatch> &() & VULKAN_HPP_NOEXCEPT
{ {
return value; return value;
@ -15913,6 +15914,7 @@ namespace VULKAN_HPP_NAMESPACE
{ {
return std::move( value ); return std::move( value );
} }
# endif
}; };
#endif #endif