From 1369bd562cfe31fdec8a1755d2f0506d8373d7ad Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Sat, 3 Jan 2015 00:04:10 +0500
Subject: Cycles: Fix compilation error on AVX platforms with -arch-native

Was a conflict in headers between clew and util_optimization.h.
---
 intern/cycles/device/device.cpp        | 3 ---
 intern/cycles/device/device_opencl.cpp | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp
index 011e90b36aa..e6e6befd72c 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 371008dea62..506238556ab 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"
-- 
cgit v1.2.3