[Bf-blender-cvs] [3d3a5bb8924] master: Cleanup: Remove using statements.

[Jeroen Bakker]

Commit: 3d3a5bb89240ef160d2a63da85eae937eb578e53
Author: Jeroen Bakker
Date:   Fri Mar 5 14:15:43 2021 +0100
Branches: master
https://developer.blender.org/rB3d3a5bb89240ef160d2a63da85eae937eb578e53

Cleanup: Remove using statements.

===================================================================

M	source/blender/compositor/intern/COM_ExecutionGroup.cpp
M	source/blender/compositor/intern/COM_ExecutionGroup.h
M	source/blender/compositor/intern/COM_ExecutionSystem.cpp
M	source/blender/compositor/intern/COM_ExecutionSystem.h
M	source/blender/compositor/intern/COM_NodeOperationBuilder.h
M	source/blender/compositor/intern/COM_WorkScheduler.cpp

===================================================================

diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.cpp b/source/blender/compositor/intern/COM_ExecutionGroup.cpp
index 9c21c91c370..bc0dd4f4ad2 100644
--- a/source/blender/compositor/intern/COM_ExecutionGroup.cpp
+++ b/source/blender/compositor/intern/COM_ExecutionGroup.cpp
@@ -374,7 +374,7 @@ void ExecutionGroup::execute(ExecutionSystem *graph)
 MemoryBuffer **ExecutionGroup::getInputBuffersOpenCL(int chunkNumber)
 {
   rcti rect;
-  vector<MemoryProxy *> memoryproxies;
+  std::vector<MemoryProxy *> memoryproxies;
   unsigned int index;
   determineChunkRect(&rect, chunkNumber);
 
@@ -545,7 +545,7 @@ bool ExecutionGroup::scheduleChunkWhenPossible(ExecutionSystem *graph, int xChun
   }
 
   // chunk is nor executed nor scheduled.
-  vector<MemoryProxy *> memoryProxies;
+  std::vector<MemoryProxy *> memoryProxies;
   this->determineDependingMemoryProxies(&memoryProxies);
 
   rcti rect;
@@ -586,7 +586,7 @@ void ExecutionGroup::determineDependingAreaOfInterest(rcti *input,
   this->getOutputOperation()->determineDependingAreaOfInterest(input, readOperation, output);
 }
 
-void ExecutionGroup::determineDependingMemoryProxies(vector<MemoryProxy *> *memoryProxies)
+void ExecutionGroup::determineDependingMemoryProxies(std::vector<MemoryProxy *> *memoryProxies)
 {
   unsigned int index;
   for (index = 0; index < this->m_cachedReadOperations.size(); index++) {
diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.h b/source/blender/compositor/intern/COM_ExecutionGroup.h
index dd079415d09..a311d2681d4 100644
--- a/source/blender/compositor/intern/COM_ExecutionGroup.h
+++ b/source/blender/compositor/intern/COM_ExecutionGroup.h
@@ -30,8 +30,6 @@
 #include "COM_NodeOperation.h"
 #include <vector>
 
-using std::vector;
-
 class ExecutionSystem;
 class MemoryProxy;
 class ReadBufferOperation;
@@ -405,7 +403,7 @@ class ExecutionGroup {
    * \note the area of the MemoryProxy.creator that has to be executed.
    * \param memoryProxies: result
    */
-  void determineDependingMemoryProxies(vector<MemoryProxy *> *memoryProxies);
+  void determineDependingMemoryProxies(std::vector<MemoryProxy *> *memoryProxies);
 
   /**
    * \brief Determine the rect (minx, maxx, miny, maxy) of a chunk.
diff --git a/source/blender/compositor/intern/COM_ExecutionSystem.cpp b/source/blender/compositor/intern/COM_ExecutionSystem.cpp
index 4c0c7d2103e..6fbcd4259c9 100644
--- a/source/blender/compositor/intern/COM_ExecutionSystem.cpp
+++ b/source/blender/compositor/intern/COM_ExecutionSystem.cpp
@@ -135,7 +135,7 @@ void ExecutionSystem::execute()
   DebugInfo::execute_started(this);
 
   unsigned int order = 0;
-  for (vector<NodeOperation *>::iterator iter = this->m_operations.begin();
+  for (std::vector<NodeOperation *>::iterator iter = this->m_operations.begin();
        iter != this->m_operations.end();
        ++iter) {
     NodeOperation *operation = *iter;
@@ -202,7 +202,7 @@ void ExecutionSystem::execute()
 void ExecutionSystem::executeGroups(CompositorPriority priority)
 {
   unsigned int index;
-  vector<ExecutionGroup *> executionGroups;
+  std::vector<ExecutionGroup *> executionGroups;
   this->findOutputExecutionGroup(&executionGroups, priority);
 
   for (index = 0; index < executionGroups.size(); index++) {
@@ -211,7 +211,7 @@ void ExecutionSystem::executeGroups(CompositorPriority priority)
   }
 }
 
-void ExecutionSystem::findOutputExecutionGroup(vector<ExecutionGroup *> *result,
+void ExecutionSystem::findOutputExecutionGroup(std::vector<ExecutionGroup *> *result,
                                                CompositorPriority priority) const
 {
   unsigned int index;
@@ -223,7 +223,7 @@ void ExecutionSystem::findOutputExecutionGroup(vector<ExecutionGroup *> *result,
   }
 }
 
-void ExecutionSystem::findOutputExecutionGroup(vector<ExecutionGroup *> *result) const
+void ExecutionSystem::findOutputExecutionGroup(std::vector<ExecutionGroup *> *result) const
 {
   unsigned int index;
   for (index = 0; index < this->m_groups.size(); index++) {
diff --git a/source/blender/compositor/intern/COM_ExecutionSystem.h b/source/blender/compositor/intern/COM_ExecutionSystem.h
index d03f9b86bb6..d18125ebc50 100644
--- a/source/blender/compositor/intern/COM_ExecutionSystem.h
+++ b/source/blender/compositor/intern/COM_ExecutionSystem.h
@@ -137,13 +137,13 @@ class ExecutionSystem {
   /**
    * find all execution group with output nodes
    */
-  void findOutputExecutionGroup(vector<ExecutionGroup *> *result,
+  void findOutputExecutionGroup(std::vector<ExecutionGroup *> *result,
                                 CompositorPriority priority) const;
 
   /**
    * find all execution group with output nodes
    */
-  void findOutputExecutionGroup(vector<ExecutionGroup *> *result) const;
+  void findOutputExecutionGroup(std::vector<ExecutionGroup *> *result) const;
 
  public:
   /**
diff --git a/source/blender/compositor/intern/COM_NodeOperationBuilder.h b/source/blender/compositor/intern/COM_NodeOperationBuilder.h
index 5dd4022b127..0d362af4512 100644
--- a/source/blender/compositor/intern/COM_NodeOperationBuilder.h
+++ b/source/blender/compositor/intern/COM_NodeOperationBuilder.h
@@ -24,8 +24,6 @@
 
 #include "COM_NodeGraph.h"
 
-using std::vector;
-
 class CompositorContext;
 
 class Node;
diff --git a/source/blender/compositor/intern/COM_WorkScheduler.cpp b/source/blender/compositor/intern/COM_WorkScheduler.cpp
index 9ca704afdea..a70b6ba4abe 100644
--- a/source/blender/compositor/intern/COM_WorkScheduler.cpp
+++ b/source/blender/compositor/intern/COM_WorkScheduler.cpp
@@ -48,7 +48,7 @@ static ThreadLocal(CPUDevice *) g_thread_device;
 static struct {
   /** \brief list of all CPUDevices. for every hardware thread an instance of CPUDevice is created
    */
-  vector<CPUDevice *> cpu_devices;
+  std::vector<CPUDevice *> cpu_devices;
 
 #if COM_CURRENT_THREADING_MODEL == COM_TM_QUEUE
   /** \brief list of all thread for every CPUDevice in cpudevices a thread exists. */
@@ -62,7 +62,7 @@ static struct {
   cl_program opencl_program;
   /** \brief list of all OpenCLDevices. for every OpenCL GPU device an instance of OpenCLDevice is
    * created. */
-  vector<OpenCLDevice *> gpu_devices;
+  std::vector<OpenCLDevice *> gpu_devices;
   /** \brief list of all thread for every GPUDevice in cpudevices a thread exists. */
   ListBase gpu_threads;
   /** \brief all scheduled work for the GPU. */