diff options
| author | Kai Koehne <kai.koehne@digia.com> | 2013-10-28 10:27:53 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-29 15:09:29 +0100 |
| commit | 00bf148b07cb7771136ed472766400336ab4d2bf (patch) | |
| tree | cf1dd313a9e49709c47da3e332c44688deaf835d /src/3rdparty/angle | |
| parent | 684a952edbf5ec5bd70c7edae7c8eff8e87cf2de (diff) | |
| download | qtbase-00bf148b07cb7771136ed472766400336ab4d2bf.tar.gz | |
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
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/3rdparty/angle')
| -rw-r--r-- | src/3rdparty/angle/src/third_party/trace_event/trace_event.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 113b126a77..72d354dd64 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; } |