From ef6937e69e8ee3f409cf9d460d5ad300a65d5924 Mon Sep 17 00:00:00 2001 From: sschirm Date: Fri, 23 Dec 2016 14:20:36 +0100 Subject: PhysX 3.4 / APEX 1.4 release candidate @21506124 --- PhysX_3.4/Source/PhysXExtensions/src/ExtDefaultStreams.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'PhysX_3.4/Source/PhysXExtensions/src/ExtDefaultStreams.cpp') diff --git a/PhysX_3.4/Source/PhysXExtensions/src/ExtDefaultStreams.cpp b/PhysX_3.4/Source/PhysXExtensions/src/ExtDefaultStreams.cpp index 49b55f56..229d04c8 100644 --- a/PhysX_3.4/Source/PhysXExtensions/src/ExtDefaultStreams.cpp +++ b/PhysX_3.4/Source/PhysXExtensions/src/ExtDefaultStreams.cpp @@ -30,6 +30,7 @@ #include "foundation/PxPreprocessor.h" #include "foundation/PxAssert.h" #include "foundation/PxAllocatorCallback.h" +#include "foundation/PxMemory.h" #include #include "PsFoundation.h" @@ -65,13 +66,13 @@ PxU32 PxDefaultMemoryOutputStream::write(const void* src, PxU32 size) PxU8* newData = reinterpret_cast(mAllocator.allocate(mCapacity,"PxDefaultMemoryOutputStream",__FILE__,__LINE__)); PX_ASSERT(newData!=NULL); - memcpy(newData, mData, mSize); + PxMemCopy(newData, mData, mSize); if(mData) mAllocator.deallocate(mData); mData = newData; } - memcpy(mData+mSize, src, size); + PxMemCopy(mData+mSize, src, size); mSize += size; return size; } @@ -88,7 +89,7 @@ PxDefaultMemoryInputData::PxDefaultMemoryInputData(PxU8* data, PxU32 length) : PxU32 PxDefaultMemoryInputData::read(void* dest, PxU32 count) { PxU32 length = PxMin(count, mSize-mPos); - memcpy(dest, mData+mPos, length); + PxMemCopy(dest, mData+mPos, length); mPos += length; return length; } -- cgit v1.2.3