Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix printing 64 bit pointers in wxMemStruct code

Browse Source 
Don't truncate addresses under Win64 when printing debug messages using
wxMemStruct.

This avoids build errors if wxUSE_DEBUG_CONTEXT = 1 when building on
Win64.

Closes https://github.com/wxWidgets/wxWidgets/pull/1249
This commit is contained in:
iwbnwif
2019-03-06 21:55:36 +00:00
committed by Vadim Zeitlin
parent 63c08fada5
commit f33ee85566
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/memory.cpp
View File

@@ -321,7 +321,7 @@ void wxMemStruct::PrintNode ()
msg += wxT("object"); msg += wxT("object");
wxString msg2; wxString msg2;
msg2.Printf(wxT(" at 0x%lX, size %d"), (long)GetActualData(), (int)RequestSize()); msg2.Printf(wxT(" at %#zx, size %d"), wxPtrToUInt(GetActualData()), (int)RequestSize());
msg += msg2; msg += msg2;
wxLogMessage(msg); wxLogMessage(msg);
@@ -334,7 +334,7 @@ void wxMemStruct::PrintNode ()
msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum); msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
msg += wxT("non-object data"); msg += wxT("non-object data");
wxString msg2; wxString msg2;
msg2.Printf(wxT(" at 0x%lX, size %d\n"), (long)GetActualData(), (int)RequestSize()); msg2.Printf(wxT(" at %#zx, size %d\n"), wxPtrToUInt(GetActualData()), (int)RequestSize());
msg += msg2; msg += msg2;
wxLogMessage(msg); wxLogMessage(msg);
@@ -367,7 +367,7 @@ void wxMemStruct::Dump ()
msg += wxT("unknown object class"); msg += wxT("unknown object class");
wxString msg2; wxString msg2;
msg2.Printf(wxT(" at 0x%lX, size %d"), (long)GetActualData(), (int)RequestSize()); msg2.Printf(wxT(" at %#zx, size %d"), wxPtrToUInt(GetActualData()), (int)RequestSize());
msg += msg2; msg += msg2;
wxDebugContext::OutputDumpLine(msg.c_str()); wxDebugContext::OutputDumpLine(msg.c_str());
@@ -379,7 +379,7 @@ void wxMemStruct::Dump ()
msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum); msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
wxString msg2; wxString msg2;
msg2.Printf(wxT("non-object data at 0x%lX, size %d"), (long)GetActualData(), (int)RequestSize() ); msg2.Printf(wxT("non-object data at %#zx, size %d"), wxPtrToUInt(GetActualData()), (int)RequestSize() );
msg += msg2; msg += msg2;
wxDebugContext::OutputDumpLine(msg.c_str()); wxDebugContext::OutputDumpLine(msg.c_str());
} }