summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-07-17 15:28:57 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-07-17 15:30:20 +0200
commitfbe10799cfbd765b5081443bf81b5e9ee3a3cbff (patch)
tree60331a505d07262506aa55329fcd1373833755b5
parent8133cf2b977f013216f0a41b6fcb740410d83926 (diff)
fix crash with WIN64 in testrunner
Reported by: Peter Tax (cherry picked from commit d44643d07a61ee9efc100f23c47ab3969efda998)
-rw-r--r--src/msvc6/testrunner/TreeHierarchyDlg.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/msvc6/testrunner/TreeHierarchyDlg.cpp b/src/msvc6/testrunner/TreeHierarchyDlg.cpp
index 1c0b671..068a13e 100644
--- a/src/msvc6/testrunner/TreeHierarchyDlg.cpp
+++ b/src/msvc6/testrunner/TreeHierarchyDlg.cpp
@@ -103,7 +103,7 @@ TreeHierarchyDlg::addTest( CPPUNIT_NS::Test *test,
hParent );
if ( hItem != NULL )
{
- VERIFY( m_treeTests.SetItemData( hItem, (DWORD)test ) );
+ VERIFY( m_treeTests.SetItemData( hItem, (DWORD_PTR)test ) );
if ( isSuite( test ) )
addTestSuiteChildrenTo( test, hItem );
}
@@ -185,7 +185,7 @@ TreeHierarchyDlg::findSelectedTest()
HTREEITEM hItem = m_treeTests.GetSelectedItem();
if ( hItem != NULL )
{
- DWORD data;
+ DWORD_PTR data;
VERIFY( data = m_treeTests.GetItemData( hItem ) );
return reinterpret_cast<CPPUNIT_NS::Test *>( data );
}