include/tools/link.hxx | 4 ++-- include/tools/zcodec.hxx | 2 +- tools/source/zcodec/zcodec.cxx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit b0ebc5608e2f56f7377a60f49957a42ef6a89e6a Author: Noel Grandin <[email protected]> Date: Tue Dec 12 15:04:00 2017 +0200 sal_uIntPtr->size_t in ZCodec to match the underlying fields Change-Id: I79ce52b80e2589b3194616b3d43846cdefd7adae Reviewed-on: https://gerrit.libreoffice.org/46349 Tested-by: Jenkins <[email protected]> Reviewed-by: Noel Grandin <[email protected]> diff --git a/include/tools/zcodec.hxx b/include/tools/zcodec.hxx index f5dd99ac7acb..57af7c50c2a1 100644 --- a/include/tools/zcodec.hxx +++ b/include/tools/zcodec.hxx @@ -58,7 +58,7 @@ class SAL_WARN_UNUSED TOOLS_DLLPUBLIC ZCodec void UpdateCRC( sal_uInt8 const * pSource, long nDatSize ); public: - ZCodec( sal_uIntPtr nInBuf = 0x8000UL, sal_uIntPtr nOutBuf = 0x8000UL ); + ZCodec( size_t nInBufSize = 32768, size_t nOutBufSize = 32768 ); ~ZCodec(); void BeginCompression( int nCompressLevel = ZCODEC_DEFAULT_COMPRESSION, bool updateCrc = false, bool gzLib = false ); diff --git a/tools/source/zcodec/zcodec.cxx b/tools/source/zcodec/zcodec.cxx index 385ad7b04b58..bf317594f4af 100644 --- a/tools/source/zcodec/zcodec.cxx +++ b/tools/source/zcodec/zcodec.cxx @@ -37,7 +37,7 @@ static const int gz_magic[2] = { 0x1f, 0x8b }; /* gzip magic header */ -ZCodec::ZCodec( sal_uIntPtr nInBufSize, sal_uIntPtr nOutBufSize ) +ZCodec::ZCodec( size_t nInBufSize, size_t nOutBufSize ) : meState(STATE_INIT) , mbStatus(false) , mbFinish(false) commit a000ee86e676535a07b28cf6a0b8dd9655164e3f Author: Noel Grandin <[email protected]> Date: Tue Dec 12 14:59:56 2017 +0200 sal_uIntPtr->char* in Link Change-Id: I02bad98458ae0c41b4bbc1b4ec79f3f935d4beaa Reviewed-on: https://gerrit.libreoffice.org/46348 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Noel Grandin <[email protected]> diff --git a/include/tools/link.hxx b/include/tools/link.hxx index 8b65be4755dd..c4989e0593f3 100644 --- a/include/tools/link.hxx +++ b/include/tools/link.hxx @@ -88,8 +88,8 @@ public: bool operator !() const { return !IsSet(); } bool operator <(Link const & other) const { - sal_uIntPtr ptr1 = reinterpret_cast<sal_uIntPtr>(function_); - sal_uIntPtr ptr2 = reinterpret_cast<sal_uIntPtr>(other.function_); + char* ptr1 = reinterpret_cast<char*>(function_); + char* ptr2 = reinterpret_cast<char*>(other.function_); if (ptr1 < ptr2) return true; else if (ptr1 > ptr2) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
