From a26154680ee443216d7346ea2f44a1205cc251f9 Mon Sep 17 00:00:00 2001 From: Karl Schultz Date: Fri, 20 Jan 2017 13:19:20 -0700 Subject: build: Enable declaration hiding warning on Windows Fixes #1388 Turn on the Windows compiler option (4456) to report hidden declarations. Fix all places where this was occurring. Change-Id: I3346d87da8b70d6299c206fcac68520a091ed1a6 --- layers/object_tracker.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'layers/object_tracker.cpp') diff --git a/layers/object_tracker.cpp b/layers/object_tracker.cpp index 6b854beb..f4acbe36 100644 --- a/layers/object_tracker.cpp +++ b/layers/object_tracker.cpp @@ -4338,7 +4338,7 @@ VKAPI_ATTR VkResult VKAPI_CALL RegisterDeviceEventEXT(VkDevice device, const VkD if (dev_data->dispatch_table.RegisterDeviceEventEXT) { result = dev_data->dispatch_table.RegisterDeviceEventEXT(device, pDeviceEventInfo, pAllocator, pFence); if (result == VK_SUCCESS && pFence != NULL) { - std::lock_guard lock(global_lock); + std::lock_guard create_lock(global_lock); CreateObject(device, *pFence, VK_DEBUG_REPORT_OBJECT_TYPE_FENCE_EXT, pAllocator); } } @@ -4360,7 +4360,7 @@ VKAPI_ATTR VkResult VKAPI_CALL RegisterDisplayEventEXT(VkDevice device, VkDispla if (dev_data->dispatch_table.RegisterDisplayEventEXT) { result = dev_data->dispatch_table.RegisterDisplayEventEXT(device, display, pDisplayEventInfo, pAllocator, pFence); if (result == VK_SUCCESS && pFence != NULL) { - std::lock_guard lock(global_lock); + std::lock_guard create_lock(global_lock); CreateObject(device, *pFence, VK_DEBUG_REPORT_OBJECT_TYPE_FENCE_EXT, pAllocator); } } -- cgit v1.2.3