[Libreoffice-commits] cppunit.git: Branch 'cppunit-1-13' - src/msvc6

[Markus Mohrhard]

 src/msvc6/testrunner/TreeHierarchyDlg.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fbe10799cfbd765b5081443bf81b5e9ee3a3cbff
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Thu Jul 17 15:28:57 2014 +0200

    fix crash with WIN64 in testrunner
    
    Reported by: Peter Tax
    (cherry picked from commit d44643d07a61ee9efc100f23c47ab3969efda998)

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 );
   }