From 2c80b046912fae02acda02549675fd3b551f30b9 Mon Sep 17 00:00:00 2001 From: Lynix Date: Thu, 15 Sep 2016 00:44:40 +0200 Subject: [PATCH] VulkanRenderer/DeviceMemory: Fix linking error Former-commit-id: 849e76f479aaf77646ae786584ac896838cc2f63 [formerly fcbd8bd667d6cfac01e01241bea06c43d34a1ad0] [formerly e042ac243512c07e9870213ec7d5a0e9ff7a4ba2 [formerly 378029f40ef5dee44eb29a73e3d39639bd91cee6]] Former-commit-id: c284ca126ded4435adbe15ca2a3e619fa2e09e1a [formerly 69da980659df0005066ef6b21a181359d28b184b] Former-commit-id: a989d3a678fd4c0ce1c23f54c5f3fda5fb175e2e --- include/Nazara/VulkanRenderer/VkDeviceMemory.hpp | 2 +- include/Nazara/VulkanRenderer/VkDeviceMemory.inl | 2 +- include/Nazara/VulkanRenderer/VkDeviceObject.hpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/Nazara/VulkanRenderer/VkDeviceMemory.hpp b/include/Nazara/VulkanRenderer/VkDeviceMemory.hpp index c2a5b72c5..7e6755dba 100644 --- a/include/Nazara/VulkanRenderer/VkDeviceMemory.hpp +++ b/include/Nazara/VulkanRenderer/VkDeviceMemory.hpp @@ -21,7 +21,7 @@ namespace Nz public: DeviceMemory(); DeviceMemory(const DeviceMemory&) = delete; - DeviceMemory(DeviceMemory&& memory); + inline DeviceMemory(DeviceMemory&& memory); ~DeviceMemory() = default; using DeviceObject::Create; diff --git a/include/Nazara/VulkanRenderer/VkDeviceMemory.inl b/include/Nazara/VulkanRenderer/VkDeviceMemory.inl index 2e0c26b30..19ed76ccd 100644 --- a/include/Nazara/VulkanRenderer/VkDeviceMemory.inl +++ b/include/Nazara/VulkanRenderer/VkDeviceMemory.inl @@ -16,7 +16,7 @@ namespace Nz { } - DeviceMemory::DeviceMemory(DeviceMemory&& memory) : + inline DeviceMemory::DeviceMemory(DeviceMemory&& memory) : DeviceObject(std::move(memory)) { m_mappedPtr = memory.m_mappedPtr; diff --git a/include/Nazara/VulkanRenderer/VkDeviceObject.hpp b/include/Nazara/VulkanRenderer/VkDeviceObject.hpp index 3778a73ea..5a61bf2ee 100644 --- a/include/Nazara/VulkanRenderer/VkDeviceObject.hpp +++ b/include/Nazara/VulkanRenderer/VkDeviceObject.hpp @@ -21,7 +21,7 @@ namespace Nz public: inline DeviceObject(); DeviceObject(const DeviceObject&) = delete; - DeviceObject(DeviceObject&&); + inline DeviceObject(DeviceObject&& object); inline ~DeviceObject(); inline bool Create(const DeviceHandle& device, const CreateInfo& createInfo, const VkAllocationCallbacks* allocator = nullptr);