From fdd75b00bf3996c554fc82e80f9974f5caf3d893 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Czerpak?= Date: Fri, 22 Jan 2016 16:55:41 +0100 Subject: [PATCH] 2016-01-22 16:55 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * contrib/rddads/ads1.c * src/rdd/hbsix/sxcompr.c * src/rtl/gtxwc/gtxwc.c ! cleaned C++ casting --- ChangeLog.txt | 6 ++++++ contrib/rddads/ads1.c | 4 ++-- src/rdd/hbsix/sxcompr.c | 2 +- src/rtl/gtxwc/gtxwc.c | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index f56186d9ad..9306b75add 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,12 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2016-01-22 16:55 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) + * contrib/rddads/ads1.c + * src/rdd/hbsix/sxcompr.c + * src/rtl/gtxwc/gtxwc.c + ! cleaned C++ casting + 2016-01-21 20:42 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * contrib/gtalleg/gtallegd.c * contrib/hbamf/amfdec.c diff --git a/contrib/rddads/ads1.c b/contrib/rddads/ads1.c index ee5e23b4d3..71f3667e46 100644 --- a/contrib/rddads/ads1.c +++ b/contrib/rddads/ads1.c @@ -2634,7 +2634,7 @@ static HB_ERRCODE adsPutValue( ADSAREAP pArea, HB_USHORT uiIndex, PHB_ITEM pItem if( nLen > ( HB_SIZE ) pField->uiLen ) nLen = pField->uiLen; u32RetVal = AdsSetStringW( pArea->hTable, ADSFIELD( uiIndex ), - HB_UNCONST( pwBuffer ), + ( WCHAR * ) HB_UNCONST( pwBuffer ), ( UNSIGNED32 ) nLen ); hb_strfree( hString ); } @@ -2762,7 +2762,7 @@ static HB_ERRCODE adsPutValue( ADSAREAP pArea, HB_USHORT uiIndex, PHB_ITEM pItem const HB_WCHAR * pwBuffer = hb_itemGetStrU16( pItem, HB_CDP_ENDIAN_LITTLE, &hString, &nLen ); u32RetVal = AdsSetStringW( pArea->hTable, ADSFIELD( uiIndex ), - HB_UNCONST( pwBuffer ), + ( WCHAR * ) HB_UNCONST( pwBuffer ), ( UNSIGNED32 ) nLen ); hb_strfree( hString ); } diff --git a/src/rdd/hbsix/sxcompr.c b/src/rdd/hbsix/sxcompr.c index b4bd076075..5fec9ea495 100644 --- a/src/rdd/hbsix/sxcompr.c +++ b/src/rdd/hbsix/sxcompr.c @@ -216,7 +216,7 @@ static PHB_LZSSX_COMPR hb_LZSSxInit( nDstBuf = LZSS_IOBUFLEN; pCompr->pInput = pInput; - pCompr->inBuffer = HB_UNCONST( pSrcBuf ); + pCompr->inBuffer = ( HB_BYTE * ) HB_UNCONST( pSrcBuf ); pCompr->inBuffSize = nSrcBuf; pCompr->inBuffPos = 0; pCompr->inBuffRead = ( pInput == NULL ) ? nSrcBuf : 0; diff --git a/src/rtl/gtxwc/gtxwc.c b/src/rtl/gtxwc/gtxwc.c index 0d33a70f1b..a56d0c93d3 100644 --- a/src/rtl/gtxwc/gtxwc.c +++ b/src/rtl/gtxwc/gtxwc.c @@ -5745,7 +5745,7 @@ static HB_BOOL hb_gt_xwc_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) } } else - pFreeImage = hb_arrayGetPtr( pInfo->pNewVal, 1 ); + pFreeImage = ( const char * ) hb_arrayGetPtr( pInfo->pNewVal, 1 ); } if( pFreeImage != NULL ) xImage = XCreateImage( wnd->dpy, DefaultVisual( wnd->dpy, DefaultScreen( wnd->dpy ) ),