[Bf-blender-cvs] [5be01ff] blender-v2.73-release: Cycles: Fix compilation error on AVX platforms with -arch-native

[Sergey Sharybin]

Commit: 5be01ff4b3add558bf6f6be41d2110abfa2f3f54
Author: Sergey Sharybin
Date:   Sat Jan 3 00:04:10 2015 +0500
Branches: blender-v2.73-release
https://developer.blender.org/rB5be01ff4b3add558bf6f6be41d2110abfa2f3f54

Cycles: Fix compilation error on AVX platforms with -arch-native

Was a conflict in headers between clew and util_optimization.h.

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

M	intern/cycles/device/device.cpp
M	intern/cycles/device/device_opencl.cpp

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

diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp
index efdfa98..b342553 100644
--- a/intern/cycles/device/device.cpp
+++ b/intern/cycles/device/device.cpp
@@ -20,9 +20,6 @@
 #include "device.h"
 #include "device_intern.h"
 
-#include "cuew.h"
-#include "clew.h"
-
 #include "util_debug.h"
 #include "util_foreach.h"
 #include "util_half.h"
diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp
index 58b2bca..2808296 100644
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -20,13 +20,13 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "clew.h"
+
 #include "device.h"
 #include "device_intern.h"
 
 #include "buffers.h"
 
-#include "clew.h"
-
 #include "util_foreach.h"
 #include "util_map.h"
 #include "util_math.h"