Merge pull request #808 from theoractice/develop

Fix a minor compiler error in VisualStudio with CMake
2016-03-20 09:07:47 -04:00
parent 74cc2d6623 fc3a558515
commit 7a3d7b1f52
1 changed files with 1 additions and 1 deletions
--- a/common_x86.h
+++ b/common_x86.h
@@ -62,7 +62,7 @@ static void __inline blas_lock(volatile BLASULONG *address){

 #if defined(_MSC_VER) && !defined(__clang__)
 	// use intrinsic instead of inline assembly
-	ret = _InterlockedExchange(address, 1);
+	ret = _InterlockedExchange((volatile LONG *)address, 1);
 	// inline assembly
 	/*__asm {
 		mov eax, address