From 31fc7fe30cae548521c0511867b877b9c4048809 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Tue, 28 Oct 2014 08:17:16 -0700 Subject: [PATCH] fix a couple low hanging 64 bit portability issues --- external/ours/library/archive/src/shared/ByteStream.cpp | 2 +- external/ours/library/crypto/src/shared/original/misc.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/external/ours/library/archive/src/shared/ByteStream.cpp b/external/ours/library/archive/src/shared/ByteStream.cpp index de840820..da544b94 100644 --- a/external/ours/library/archive/src/shared/ByteStream.cpp +++ b/external/ours/library/archive/src/shared/ByteStream.cpp @@ -345,7 +345,7 @@ ByteStream::Data *ByteStream::Data::getNewData() void ByteStream::Data::releaseOldData(ByteStream::Data *oldData) { - assert(reinterpret_cast(oldData) != 0xefefefefu); + assert(reinterpret_cast(oldData) != 0xefefefefu); if (oldData->size > 4096) delete oldData; diff --git a/external/ours/library/crypto/src/shared/original/misc.h b/external/ours/library/crypto/src/shared/original/misc.h index 0c79fa30..8eb15e2e 100644 --- a/external/ours/library/crypto/src/shared/original/misc.h +++ b/external/ours/library/crypto/src/shared/original/misc.h @@ -55,7 +55,7 @@ inline unsigned int RoundUpToMultipleOf(unsigned int n, unsigned int m) template inline bool IsAligned(const void *p) { - return (unsigned int)p % sizeof(T) == 0; + return (uintptr_t)p % sizeof(T) == 0; } inline bool CheckEndianess(bool highFirst)