diff options
| author | Erik Verbruggen <erik.verbruggen@digia.com> | 2014-03-05 18:03:31 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-07 12:20:24 +0100 |
| commit | 0d3d8aa924f07da2364c73bfb1b4c95cd3429d10 (patch) | |
| tree | e6e1cfe92f1fddda96cc8f33c4e487cb0d3491e4 /src/3rdparty/masm/assembler | |
| parent | 289d93f785dc3006dd77c33e121c110c5176ac6d (diff) | |
Fix MSVC2012 compiler warnings in disabled code.
... that should soon get enabled.
Change-Id: I2f8393cab5e99a7f5d3c7df6af6385fefd2d4dd1
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/3rdparty/masm/assembler')
| -rw-r--r-- | src/3rdparty/masm/assembler/LinkBuffer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/masm/assembler/LinkBuffer.cpp b/src/3rdparty/masm/assembler/LinkBuffer.cpp index 645eba5380..bf4f2f5278 100644 --- a/src/3rdparty/masm/assembler/LinkBuffer.cpp +++ b/src/3rdparty/masm/assembler/LinkBuffer.cpp @@ -154,7 +154,8 @@ void LinkBuffer::performFinalization() #if ENABLE(BRANCH_COMPACTION) ExecutableAllocator::makeExecutable(code(), m_initialSize); #else - ExecutableAllocator::makeExecutable(code(), m_size); + ASSERT(m_size <= INT_MAX); + ExecutableAllocator::makeExecutable(code(), static_cast<int>(m_size)); #endif MacroAssembler::cacheFlush(code(), m_size); } |