diff options
| author | Karl Schultz <karl@lunarg.com> | 2017-01-20 13:19:20 -0700 |
|---|---|---|
| committer | Karl Schultz <karl@lunarg.com> | 2017-01-27 15:18:16 -0800 |
| commit | a26154680ee443216d7346ea2f44a1205cc251f9 (patch) | |
| tree | 6dce9fba9119651d86431f4ef847309c4e98775c /layers/object_tracker.cpp | |
| parent | cba7afce6be07dd968a59de2245c412273c76b99 (diff) | |
| download | usermoji-a26154680ee443216d7346ea2f44a1205cc251f9.tar.xz | |
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
Diffstat (limited to 'layers/object_tracker.cpp')
| -rw-r--r-- | layers/object_tracker.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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<std::mutex> lock(global_lock); + std::lock_guard<std::mutex> 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<std::mutex> lock(global_lock); + std::lock_guard<std::mutex> create_lock(global_lock); CreateObject(device, *pFence, VK_DEBUG_REPORT_OBJECT_TYPE_FENCE_EXT, pAllocator); } } |