[Bf-blender-cvs] [6f36e1f] master: Fix compilation error on Windows

Sergey Sharybin noreply at git.blender.org
Fri Jun 12 17:33:13 CEST 2015


Commit: 6f36e1f872a61c36cc5242d20476886c3061fa3f
Author: Sergey Sharybin
Date:   Fri Jun 12 17:32:09 2015 +0500
Branches: master
https://developer.blender.org/rB6f36e1f872a61c36cc5242d20476886c3061fa3f

Fix compilation error on Windows

The issue was caused by conflicting declaration of HKEY
happening in our WM code and somewhere deeper in atomic
operations headers hierarchy.

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

M	source/blender/compositor/intern/COM_ExecutionGroup.cpp

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

diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.cpp b/source/blender/compositor/intern/COM_ExecutionGroup.cpp
index a7f45ff..025ed76 100644
--- a/source/blender/compositor/intern/COM_ExecutionGroup.cpp
+++ b/source/blender/compositor/intern/COM_ExecutionGroup.cpp
@@ -25,6 +25,8 @@
 #include <sstream>
 #include <stdlib.h>
 
+#include "atomic_ops.h"
+
 #include "COM_ExecutionGroup.h"
 #include "COM_defines.h"
 #include "COM_ExecutionSystem.h"
@@ -44,8 +46,6 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
-#include "atomic_ops.h"
-
 ExecutionGroup::ExecutionGroup()
 {
 	this->m_isOutput = false;




More information about the Bf-blender-cvs mailing list