AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation with MinGW gcc 64 bit

Browse Source 
Fix compilation of ANGLE with gcc 4.8.0 64 bit: The

  reinterpret_cast<unsigned long>(void*)

was causing

  error: cast from 'const void*' to 'long unsigned int' loses precision

Task-number: QTBUG-34395
Change-Id: Ibde75dd4b5536f3827bdf0ab02a15e93a1a8a4f0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
Kai Koehne 2013-10-28 10:27:53 +01:00 committed by The Qt Project
parent 684a952edb
commit 00bf148b07
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/3rdparty/angle/src/third_party/trace_event/trace_event.h vendored
View File

@ -589,7 +589,7 @@ const unsigned long long noEventId = 0;
class TraceID {
public:
explicit TraceID(const void* id, unsigned char* flags) :
m_data(static_cast<unsigned long long>(reinterpret_cast<unsigned long>(id)))
m_data(reinterpret_cast<unsigned long long>(id))
{
*flags |= TRACE_EVENT_FLAG_MANGLE_ID;
}

35
src/angle/patches/0001-Fix-compilation-with-MinGW-gcc-64-bit.patch Normal file
View File

@ -0,0 +1,35 @@
From 821c28d387b332bf16b6ea35ec22a77d3ba41632 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@digia.com>
Date: Mon, 28 Oct 2013 10:27:53 +0100
Subject: [PATCH] Fix compilation with MinGW gcc 64 bit
Fix compilation of ANGLE with gcc 4.8.0 64 bit: The
reinterpret_cast<unsigned long>(void*)
was causing
error: cast from 'const void*' to 'long unsigned int' loses precision
Task-number: QTBUG-34395
Change-Id: Ibde75dd4b5536f3827bdf0ab02a15e93a1a8a4f0
---
src/3rdparty/angle/src/third_party/trace_event/trace_event.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/3rdparty/angle/src/third_party/trace_event/trace_event.h b/src/3rdparty/angle/src/third_party/trace_event/trace_event.h
index 113b126..72d354d 100644
--- a/src/3rdparty/angle/src/third_party/trace_event/trace_event.h
+++ b/src/3rdparty/angle/src/third_party/trace_event/trace_event.h
@@ -589,7 +589,7 @@ const unsigned long long noEventId = 0;
class TraceID {
public:
explicit TraceID(const void* id, unsigned char* flags) :
- m_data(static_cast<unsigned long long>(reinterpret_cast<unsigned long>(id)))
+ m_data(reinterpret_cast<unsigned long long>(id))
{
*flags |= TRACE_EVENT_FLAG_MANGLE_ID;
}
--
1.8.3.msysgit.0