Merge remote-tracking branch 'origin/master' into lanpr-under-gp

1 files changed, 2 insertions, 6 deletions

diff --git a/source/blender/compositor/intern/COM_NodeOperation.h b/source/blender/compositor/intern/COM_NodeOperation.h
index 0ce7c1389bd..f26279e2869 100644
--- a/source/blender/compositor/intern/COM_NodeOperation.h
+++ b/source/blender/compositor/intern/COM_NodeOperation.h
@@ -33,10 +33,6 @@
 
 #include "clew.h"
 
-using std::list;
-using std::max;
-using std::min;
-
 class OpenCLDevice;
 class ReadBufferOperation;
 class WriteBufferOperation;
@@ -239,8 +235,8 @@ class NodeOperation : public SocketReader {
                              MemoryBuffer * /*outputMemoryBuffer*/,
                              cl_mem /*clOutputBuffer*/,
                              MemoryBuffer ** /*inputMemoryBuffers*/,
-                             list<cl_mem> * /*clMemToCleanUp*/,
-                             list<cl_kernel> * /*clKernelsToCleanUp*/)
+                             std::list<cl_mem> * /*clMemToCleanUp*/,
+                             std::list<cl_kernel> * /*clKernelsToCleanUp*/)
   {
   }
   virtual void deinitExecution();