From 725c207ec8bc12bc8b264f46e77c0df93db0ac3d Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Fri, 17 May 2019 14:55:29 +0100
Subject: [PATCH] Remove 'using std::list'

---
 renderdoc/driver/d3d11/d3d11_context.h | 4 +---
 renderdoc/driver/gl/gl_driver.h        | 4 +---
 renderdoc/driver/gl/gl_postvs.cpp      | 2 +-
 renderdoc/driver/vulkan/vk_core.h      | 5 ++---
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/renderdoc/driver/d3d11/d3d11_context.h b/renderdoc/driver/d3d11/d3d11_context.h
index 282480c9d..95f829ca2 100644
--- a/renderdoc/driver/d3d11/d3d11_context.h
+++ b/renderdoc/driver/d3d11/d3d11_context.h
@@ -33,8 +33,6 @@
 #include "d3d11_manager.h"
 #include "d3d11_video.h"
 
-using std::list;
-
 struct MapIntercept
 {
   MapIntercept()
@@ -220,7 +218,7 @@ private:
   DrawcallDescription m_ParentDrawcall;
   std::map<ResourceId, DrawcallDescription> m_CmdLists;
 
-  list<DrawcallDescription *> m_DrawcallStack;
+  std::list<DrawcallDescription *> m_DrawcallStack;
 
   D3D11ResourceManager *GetResourceManager();
   static std::string GetChunkName(uint32_t idx);
diff --git a/renderdoc/driver/gl/gl_driver.h b/renderdoc/driver/gl/gl_driver.h
index 5d0e32246..5e5e3d576 100644
--- a/renderdoc/driver/gl/gl_driver.h
+++ b/renderdoc/driver/gl/gl_driver.h
@@ -38,8 +38,6 @@
 #include "gl_replay.h"
 #include "gl_resources.h"
 
-using std::list;
-
 struct GLInitParams
 {
   GLInitParams();
@@ -238,7 +236,7 @@ private:
 
   DrawcallDescription m_ParentDrawcall;
 
-  list<DrawcallDescription *> m_DrawcallStack;
+  std::list<DrawcallDescription *> m_DrawcallStack;
 
   std::map<ResourceId, vector<EventUsage>> m_ResourceUses;
 
diff --git a/renderdoc/driver/gl/gl_postvs.cpp b/renderdoc/driver/gl/gl_postvs.cpp
index 881328767..8d7f0a2b7 100644
--- a/renderdoc/driver/gl/gl_postvs.cpp
+++ b/renderdoc/driver/gl/gl_postvs.cpp
@@ -264,7 +264,7 @@ void GLReplay::InitPostVSBuffers(uint32_t eventId)
   if(dummyFrag)
     drv.glAttachShader(feedbackProg, dummyFrag);
 
-  list<std::string> matrixVaryings;    // matrices need some fixup
+  std::list<std::string> matrixVaryings;    // matrices need some fixup
   vector<const char *> varyings;
 
   CopyProgramAttribBindings(stageSrcPrograms[0], feedbackProg, vsRefl);
diff --git a/renderdoc/driver/vulkan/vk_core.h b/renderdoc/driver/vulkan/vk_core.h
index 992a37022..cbf5ccd81 100644
--- a/renderdoc/driver/vulkan/vk_core.h
+++ b/renderdoc/driver/vulkan/vk_core.h
@@ -34,7 +34,6 @@
 #include "vk_replay.h"
 #include "vk_state.h"
 
-using std::list;
 using std::vector;
 
 class VulkanShaderCache;
@@ -860,9 +859,9 @@ private:
                          byte *argend);
   void InsertDrawsAndRefreshIDs(BakedCmdBufferInfo &cmdBufInfo);
 
-  list<VulkanDrawcallTreeNode *> m_DrawcallStack;
+  std::list<VulkanDrawcallTreeNode *> m_DrawcallStack;
 
-  list<VulkanDrawcallTreeNode *> &GetDrawcallStack()
+  std::list<VulkanDrawcallTreeNode *> &GetDrawcallStack()
   {
     if(m_LastCmdBufferID != ResourceId())
       return m_BakedCmdBufferInfo[m_LastCmdBufferID].drawStack;