From 3d3a5bb89240ef160d2a63da85eae937eb578e53 Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Fri, 5 Mar 2021 14:15:43 +0100 Subject: Cleanup: Remove using statements. --- source/blender/compositor/intern/COM_ExecutionGroup.cpp | 6 +++--- source/blender/compositor/intern/COM_ExecutionGroup.h | 4 +--- source/blender/compositor/intern/COM_ExecutionSystem.cpp | 8 ++++---- source/blender/compositor/intern/COM_ExecutionSystem.h | 4 ++-- source/blender/compositor/intern/COM_NodeOperationBuilder.h | 2 -- source/blender/compositor/intern/COM_WorkScheduler.cpp | 4 ++-- 6 files changed, 12 insertions(+), 16 deletions(-) (limited to 'source/blender/compositor') 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 memoryproxies; + std::vector 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 memoryProxies; + std::vector 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 *memoryProxies) +void ExecutionGroup::determineDependingMemoryProxies(std::vector *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 -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 *memoryProxies); + void determineDependingMemoryProxies(std::vector *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::iterator iter = this->m_operations.begin(); + for (std::vector::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 executionGroups; + std::vector 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 *result, +void ExecutionSystem::findOutputExecutionGroup(std::vector *result, CompositorPriority priority) const { unsigned int index; @@ -223,7 +223,7 @@ void ExecutionSystem::findOutputExecutionGroup(vector *result, } } -void ExecutionSystem::findOutputExecutionGroup(vector *result) const +void ExecutionSystem::findOutputExecutionGroup(std::vector *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 *result, + void findOutputExecutionGroup(std::vector *result, CompositorPriority priority) const; /** * find all execution group with output nodes */ - void findOutputExecutionGroup(vector *result) const; + void findOutputExecutionGroup(std::vector *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 cpu_devices; + std::vector 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 gpu_devices; + std::vector 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. */ -- cgit v1.2.3