From 015a4bb2f137c7ee1fe4c92b5cad1d35f808fb5c Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 13 Oct 2017 15:01:17 +0200 Subject: [PATCH] QVulkanInstance: Fix compilation with MSVC2013 Use assignment. Fixes: vulkan\qvulkaninstance.cpp(811) : error C2061: syntax error : identifier 'd_ptr' vulkan\qvulkaninstance.cpp(812) : warning C4551: function call missing argument list vulkan\qvulkaninstance.cpp(813) : error C2659: '=' : function as left operand vulkan\qvulkaninstance.cpp(814) : error C2440: 'return' : cannot convert from 'QVulkanDeviceFunctions *&(__cdecl *)(void)' to 'QVulkanDeviceFunctions *' There is no context in which this conversion is possible vulkan\qvulkaninstance.cpp(832) : error C2061: syntax error : identifier 'd_ptr' vulkan\qvulkaninstance.cpp(833) : error C2541: 'delete' : cannot delete objects that are not pointers vulkan\qvulkaninstance.cpp(834) : error C2659: '=' : function as left operand Change-Id: I859b141aa0cb24b1f85dc9f229262a4145651d7c Reviewed-by: Laszlo Agocs --- src/gui/vulkan/qvulkaninstance.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/vulkan/qvulkaninstance.cpp b/src/gui/vulkan/qvulkaninstance.cpp index 8f364328d68..2e03be8151c 100644 --- a/src/gui/vulkan/qvulkaninstance.cpp +++ b/src/gui/vulkan/qvulkaninstance.cpp @@ -808,7 +808,7 @@ QVulkanFunctions *QVulkanInstance::functions() const */ QVulkanDeviceFunctions *QVulkanInstance::deviceFunctions(VkDevice device) { - QVulkanDeviceFunctions *&f(d_ptr->deviceFuncs[device]); + QVulkanDeviceFunctions *&f = d_ptr->deviceFuncs[device]; if (!f) f = new QVulkanDeviceFunctions(this, device); return f; @@ -829,7 +829,7 @@ QVulkanDeviceFunctions *QVulkanInstance::deviceFunctions(VkDevice device) */ void QVulkanInstance::resetDeviceFunctions(VkDevice device) { - QVulkanDeviceFunctions *&f(d_ptr->deviceFuncs[device]); + QVulkanDeviceFunctions *&f = d_ptr->deviceFuncs[device]; delete f; f = nullptr; }