From a237fe6654599485c9ae86c3bc77b6c2686ea3a4 Mon Sep 17 00:00:00 2001 From: Mindaugas Kavaliauskas Date: Fri, 24 Apr 2009 22:34:29 +0000 Subject: [PATCH] 2009-04-25 01:35 UTC+0300 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt) * harbour/contrib/hbole/olecore.c ! fixed C++ compile errors --- harbour/ChangeLog | 4 ++++ harbour/contrib/hbole/olecore.c | 8 +++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 8ed35a52ed..4a76d8c510 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,10 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-04-25 01:35 UTC+0300 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt) + * harbour/contrib/hbole/olecore.c + ! fixed C++ compile errors + 2009-04-24 23:15 UTC+0300 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt) * harbour/contrib/hbole/olecore.c * harbour/contrib/hbole/oleauto.prg diff --git a/harbour/contrib/hbole/olecore.c b/harbour/contrib/hbole/olecore.c index 8d8e3f0442..6536493280 100644 --- a/harbour/contrib/hbole/olecore.c +++ b/harbour/contrib/hbole/olecore.c @@ -575,16 +575,14 @@ HB_FUNC( __OLEENUMCREATE ) /* ( __hObj ) */ lOleError = ( variant.n1.n2.n3.punkVal )->lpVtbl->QueryInterface( variant.n1.n2.n3.punkVal, &IID_IEnumVARIANT, ( void** ) &pEnum ); #else - lOleError = ( variant.n1.n2.n3.punkVal )->QueryInterface( variant.n1.n2.n3.punkVal, - IID_IEnumVARIANT, ( void** ) &pEnum ); + lOleError = ( variant.n1.n2.n3.punkVal )->QueryInterface( IID_IEnumVARIANT, ( void** ) &pEnum ); #endif else if( variant.n1.n2.vt == VT_DISPATCH ) #if HB_OLE_C_API lOleError = ( variant.n1.n2.n3.pdispVal )->lpVtbl->QueryInterface( variant.n1.n2.n3.pdispVal, &IID_IEnumVARIANT, ( void** ) &pEnum ); #else - lOleError = ( variant.n1.n2.pdispVal )->QueryInterface( variant.n1.n2.n3.pdispVal, - IID_IEnumVARIANT, ( void** ) &pEnum ); + lOleError = ( variant.n1.n2.n3.pdispVal )->QueryInterface( IID_IEnumVARIANT, ( void** ) &pEnum ); #endif else { @@ -619,7 +617,7 @@ HB_FUNC( __OLEENUMNEXT ) #if HB_OLE_C_API if( pEnum->lpVtbl->Next( pEnum, 1, &variant, NULL ) == S_OK ) #else - if( pEnum->Next( pEnum, 1, &variant, NULL ) == S_OK ) + if( pEnum->Next( 1, &variant, NULL ) == S_OK ) #endif { hb_oleVariantToItem( hb_stackReturnItem(), &variant );