[Bf-blender-cvs] [1369bd5] master: Cycles: Fix compilation error on AVX platforms with -arch-native
Sergey Sharybin
noreply at git.blender.org
Fri Jan 2 20:11:37 CET 2015
Commit: 1369bd562cfe31fdec8a1755d2f0506d8373d7ad
Author: Sergey Sharybin
Date: Sat Jan 3 00:04:10 2015 +0500
Branches: master
https://developer.blender.org/rB1369bd562cfe31fdec8a1755d2f0506d8373d7ad
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 011e90b..e6e6bef 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 371008d..5062385 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"
More information about the Bf-blender-cvs
mailing list