From e7afba4b293a4e83b62b652f6dc3c16e11c15b06 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 27 Mar 2015 14:41:20 +0500 Subject: Compositor: Cleanup, don't pollute namepace with all symbols from std --- source/blender/compositor/intern/COM_ExecutionGroup.cpp | 4 ++-- source/blender/compositor/intern/COM_ExecutionSystem.h | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'source/blender/compositor/intern') diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.cpp b/source/blender/compositor/intern/COM_ExecutionGroup.cpp index a122d5d9988..4676f6867c8 100644 --- a/source/blender/compositor/intern/COM_ExecutionGroup.cpp +++ b/source/blender/compositor/intern/COM_ExecutionGroup.cpp @@ -238,7 +238,7 @@ void ExecutionGroup::execute(ExecutionSystem *graph) chunkOrders[index].determineDistance(hotspots, 1); } - sort(&chunkOrders[0], &chunkOrders[this->m_numberOfChunks - 1]); + std::sort(&chunkOrders[0], &chunkOrders[this->m_numberOfChunks - 1]); for (index = 0; index < this->m_numberOfChunks; index++) { chunkOrder[index] = chunkOrders[index].getChunkNumber(); } @@ -277,7 +277,7 @@ void ExecutionGroup::execute(ExecutionSystem *graph) chunkOrders[index].determineDistance(hotspots, 9); } - sort(&chunkOrders[0], &chunkOrders[this->m_numberOfChunks]); + std::sort(&chunkOrders[0], &chunkOrders[this->m_numberOfChunks]); for (index = 0; index < this->m_numberOfChunks; index++) { chunkOrder[index] = chunkOrders[index].getChunkNumber(); diff --git a/source/blender/compositor/intern/COM_ExecutionSystem.h b/source/blender/compositor/intern/COM_ExecutionSystem.h index ab903206f0a..555964f7b0c 100644 --- a/source/blender/compositor/intern/COM_ExecutionSystem.h +++ b/source/blender/compositor/intern/COM_ExecutionSystem.h @@ -27,14 +27,11 @@ class ExecutionGroup; #include "DNA_color_types.h" #include "DNA_node_types.h" -#include #include "COM_Node.h" #include "BKE_text.h" #include "COM_ExecutionGroup.h" #include "COM_NodeOperation.h" -using namespace std; - /** * @page execution Execution model * In order to get to an efficient model for execution, several steps are being done. these steps are explained below. -- cgit v1.2.3