From 4c501320b8e1acf2caf91ff11aab55c2cb1e2b4f Mon Sep 17 00:00:00 2001 From: Lynix Date: Mon, 13 Jun 2016 22:29:16 +0200 Subject: [PATCH] Vulkan: Make implicit conversion work on const Former-commit-id: f4ed2fb536c1cd49b786a7cc2f0db1b23888a24b [formerly 8fa97e865fb2e8cf9c3725fedee07eee3ff3ba0a] Former-commit-id: 4fbf84f1d35d008769750a3675fc9daa85bbe3cd --- include/Nazara/Vulkan/VkDeviceObject.hpp | 2 +- include/Nazara/Vulkan/VkDeviceObject.inl | 2 +- include/Nazara/Vulkan/VkSurface.hpp | 2 +- include/Nazara/Vulkan/VkSurface.inl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/Nazara/Vulkan/VkDeviceObject.hpp b/include/Nazara/Vulkan/VkDeviceObject.hpp index 49d70171f..210980a17 100644 --- a/include/Nazara/Vulkan/VkDeviceObject.hpp +++ b/include/Nazara/Vulkan/VkDeviceObject.hpp @@ -33,7 +33,7 @@ namespace Nz DeviceObject& operator=(const DeviceObject&) = delete; DeviceObject& operator=(DeviceObject&&) = delete; - inline operator VkType(); + inline operator VkType() const; protected: DeviceHandle m_device; diff --git a/include/Nazara/Vulkan/VkDeviceObject.inl b/include/Nazara/Vulkan/VkDeviceObject.inl index 8bd9eebe6..ab08688bd 100644 --- a/include/Nazara/Vulkan/VkDeviceObject.inl +++ b/include/Nazara/Vulkan/VkDeviceObject.inl @@ -76,7 +76,7 @@ namespace Nz } template - inline DeviceObject::operator VkType() + inline DeviceObject::operator VkType() const { return m_handle; } diff --git a/include/Nazara/Vulkan/VkSurface.hpp b/include/Nazara/Vulkan/VkSurface.hpp index 53cb7fd5e..b4d6a019d 100644 --- a/include/Nazara/Vulkan/VkSurface.hpp +++ b/include/Nazara/Vulkan/VkSurface.hpp @@ -76,7 +76,7 @@ namespace Nz Surface& operator=(const Surface&) = delete; Surface& operator=(Surface&&) = delete; - inline operator VkSurfaceKHR(); + inline operator VkSurfaceKHR() const; private: inline bool Create(const VkAllocationCallbacks* allocator); diff --git a/include/Nazara/Vulkan/VkSurface.inl b/include/Nazara/Vulkan/VkSurface.inl index 81b199d08..dec897cec 100644 --- a/include/Nazara/Vulkan/VkSurface.inl +++ b/include/Nazara/Vulkan/VkSurface.inl @@ -287,7 +287,7 @@ namespace Nz return false; } - inline Surface::operator VkSurfaceKHR() + inline Surface::operator VkSurfaceKHR() const { return m_surface; }