diff options
| author | Erik Verbruggen <erik.verbruggen@digia.com> | 2014-03-04 12:29:03 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-05 13:14:10 +0100 |
| commit | 7e87bf0bb7dd5b64fca0fedce046d7ab0475a4c6 (patch) | |
| tree | 5124f2f9f28663403c81779cda612c1f939dc725 /src/3rdparty | |
| parent | 6269e4fafc882b9727fe06b405b876af99060d8c (diff) | |
Fix MSVC2012 compiler warnings.
Tested on both win32 and win64.
Change-Id: I47755e2da51829e61e1452eaaf84a057224b478b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/masm/disassembler/udis86/udis86_decode.c | 2 | ||||
| -rw-r--r-- | src/3rdparty/masm/wtf/OSAllocatorWin.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/masm/disassembler/udis86/udis86_decode.c b/src/3rdparty/masm/disassembler/udis86/udis86_decode.c index 2ebd56b2a9..8bec56e470 100644 --- a/src/3rdparty/masm/disassembler/udis86/udis86_decode.c +++ b/src/3rdparty/masm/disassembler/udis86/udis86_decode.c @@ -723,7 +723,7 @@ decode_operand(struct ud *u, case OP_rSI: case OP_rDI: operand->type = UD_OP_REG; - operand->base = resolve_gpr64(u, type, &operand->size); + operand->base = resolve_gpr64(u, type, (enum ud_operand_size*)(&operand->size)); break; case OP_ALr8b: case OP_CLr9b: diff --git a/src/3rdparty/masm/wtf/OSAllocatorWin.cpp b/src/3rdparty/masm/wtf/OSAllocatorWin.cpp index 78300dc715..f95a4841c6 100644 --- a/src/3rdparty/masm/wtf/OSAllocatorWin.cpp +++ b/src/3rdparty/masm/wtf/OSAllocatorWin.cpp @@ -72,6 +72,7 @@ void OSAllocator::decommit(void* address, size_t bytes) void OSAllocator::releaseDecommitted(void* address, size_t bytes) { + (void) bytes; // suppress unused formal parameter warning // According to http://msdn.microsoft.com/en-us/library/aa366892(VS.85).aspx, // dwSize must be 0 if dwFreeType is MEM_RELEASE. bool result = VirtualFree(address, 0, MEM_RELEASE); |