diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-03-27 12:41:20 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-03-27 12:41:20 +0300 |
commit | e7afba4b293a4e83b62b652f6dc3c16e11c15b06 (patch) | |
tree | 4f9c4fd1f2e2384b986690370d5b1266d2789322 /source | |
parent | 408a2a8420c9d918236194007c01e1d3b3ebe13c (diff) |
Compositor: Cleanup, don't pollute namepace with all symbols from std
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/compositor/intern/COM_ExecutionGroup.cpp | 4 | ||||
-rw-r--r-- | source/blender/compositor/intern/COM_ExecutionSystem.h | 3 |
2 files changed, 2 insertions, 5 deletions
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 <vector> #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. |