feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix Botan compilation with ICC

Browse Source 
The __cpuid intrinsic takes int* pointers like MSVC above, not uint*.

botan.cpp(46265): error: argument of type "Botan::u32bit={unsigned int} *" is incompatible with parameter of type "int *"

(whoever thought that a file should have 46k lines needs to have their
brains examined)

Change-Id: I5128849c354e351ba771215b3290f3af8ba98987
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Thiago Macieira
2015-08-14 16:06:42 -07:00
parent 0173c63853
commit 969274a209
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/3rdparty/botan/botan.cpp vendored
View File

@@ -46200,7 +46200,7 @@ bool caseless_cmp(char a, char b)
#elif defined(BOTAN_BUILD_COMPILER_IS_INTEL)
#include <ia32intrin.h>
#define CALL_CPUID(type, out) do { __cpuid(out, type); } while(0)
#define CALL_CPUID(type, out) do { __cpuid((int*)out, type); } while(0)
#elif defined(BOTAN_BUILD_COMPILER_IS_GCC) && (BOTAN_GCC_VERSION >= 430)
@@ -46223,7 +46223,7 @@ namespace {
}
#elif defined(BOTAN_TARGET_ARCH_IS_X86_64) && \
(defined(BOTAN_BUILD_COMPILER_IS_CLANG) || defined(BOTAN_BUILD_COMPILER_IS_GCC) || defined(BOTAN_BUILD_COMPILER_IS_INTEL))
(defined(BOTAN_BUILD_COMPILER_IS_CLANG) || defined(BOTAN_BUILD_COMPILER_IS_GCC))
/*
* We can't safely use this on x86-32 as some 32-bit ABIs use ebx as