diff -u /cvsroot/abi/src/af/util/xp/ut_mbtowc.cpp.orig /cvsroot/abi/src/af/util/xp/ut_mbtowc.cpp --- /cvsroot/abi/src/af/util/xp/ut_mbtowc.cpp 2000/11/06 02:27:52 +++ src/af/util/xp/ut_mbtowc.cpp 2000/11/10 16:22:11 @@ -254,7 +254,7 @@ unsigned char outbuf[2]; char* outptr = (char* )outbuf; size_t inlen = m_bufLen, outlen = 2; - size_t len = iconv(cd,const_cast(&inptr),&inlen,&outptr,&outlen); + size_t len = iconv(cd,const_cast(&inptr),&inlen,&outptr,&outlen); if (len!=(size_t)-1) { bool swap = XAP_EncodingManager::swap_stou; unsigned short val = outbuf[swap] | (outbuf[!swap]<<8); diff -u /cvsroot/abi/src/af/util/xp/ut_wctomb.cpp.orig /cvsroot/abi/src/af/util/xp/ut_wctomb.cpp --- /cvsroot/abi/src/af/util/xp/ut_wctomb.cpp 2000/11/06 02:27:52 +++ src/af/util/xp/ut_wctomb.cpp 2000/11/10 16:22:11 @@ -201,7 +201,7 @@ buf[!swap] = b1; } size_t inlen = 2, outlen = 100; - size_t len = iconv(cd,const_cast(&ibuf),&inlen,&obuf,&outlen); + size_t len = iconv(cd,const_cast(&ibuf),&inlen,&obuf,&outlen); if (len==(size_t)-1) return 0; length = 100-outlen; diff -u /cvsroot/abi/src/af/xap/xp/xap_EncodingManager.cpp.orig /cvsroot/abi/src/af/xap/xp/xap_EncodingManager.cpp --- /cvsroot/abi/src/af/xap/xp/xap_EncodingManager.cpp 2000/11/06 02:27:52 +++ src/af/xap/xp/xap_EncodingManager.cpp 2000/11/10 16:22:13 @@ -135,7 +135,7 @@ const char* inptr = in; char* outptr = buf; size_t inbytes = strlen(in), outbytes = bufsz; - size_t donecnt = iconv(iconv_handle,const_cast(&inptr),&inbytes,&outptr,&outbytes); + size_t donecnt = iconv(iconv_handle,const_cast(&inptr),&inbytes,&outptr,&outbytes); const char* retstr = in; if (donecnt!=(size_t)-1 && inbytes==0) { retstr = buf; @@ -166,7 +166,7 @@ const char* iptr = ibuf; char* optr = obuf; ibuf[0] = (unsigned char)i; - size_t donecnt = iconv(iconv_handle,const_cast(&iptr),&ibuflen,&optr,&obuflen); + size_t donecnt = iconv(iconv_handle,const_cast(&iptr),&ibuflen,&optr,&obuflen); if (donecnt!=(size_t)-1 && ibuflen==0) { unsigned short uval; @@ -216,7 +216,7 @@ const char* iptr = ibuf; char* optr = obuf; ibuf[0] = (unsigned char)c; - size_t donecnt = iconv(iconv_handle,const_cast(&iptr),&ibuflen,&optr,&obuflen); + size_t donecnt = iconv(iconv_handle,const_cast(&iptr),&ibuflen,&optr,&obuflen); if (donecnt!=(size_t)-1 && ibuflen==0) { unsigned short uval; @@ -241,7 +241,7 @@ ibuf[XAP_EncodingManager::swap_utos] = b0; ibuf[!XAP_EncodingManager::swap_utos] = b1; } - size_t donecnt = iconv(iconv_handle,const_cast(&iptr),&ibuflen,&optr,&obuflen); + size_t donecnt = iconv(iconv_handle,const_cast(&iptr),&ibuflen,&optr,&obuflen); /* reset state */ iconv(iconv_handle,NULL,NULL,NULL,NULL); if (donecnt!=(size_t)-1 && ibuflen==0)