From 6fce78f4f8458ae91368bc039543401a56d4a62a Mon Sep 17 00:00:00 2001 From: Sankhesh Jhaveri Date: Mon, 13 Jan 2020 12:16:02 -0500 Subject: [PATCH 1/3] Fix 'clearing an object of non-trivial type' warning --- .../src/serialization/Xml/SnXmlSerialization.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/physx/source/physxextensions/src/serialization/Xml/SnXmlSerialization.cpp b/physx/source/physxextensions/src/serialization/Xml/SnXmlSerialization.cpp index 3bc791cf3..3caf24f8e 100644 --- a/physx/source/physxextensions/src/serialization/Xml/SnXmlSerialization.cpp +++ b/physx/source/physxextensions/src/serialization/Xml/SnXmlSerialization.cpp @@ -466,7 +466,8 @@ namespace physx { namespace Sn { , mVersionStr( getLatestVersion() ) , mPxCollection( &inPxCollection ) { - memset( &mScale, 0, sizeof( PxTolerancesScale ) ); + mScale.length = 0.0f; + mScale.speed = 0.0f; PX_ASSERT( mScale.isValid() == false ); } From c3210cc2c0286d8a10ce05496671eba587da9c5f Mon Sep 17 00:00:00 2001 From: Sankhesh Jhaveri Date: Mon, 13 Jan 2020 12:17:06 -0500 Subject: [PATCH 2/3] Fix 'binding reference discards qualifiers' warnings --- physx/source/geomutils/src/gjk/GuGJKType.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/physx/source/geomutils/src/gjk/GuGJKType.h b/physx/source/geomutils/src/gjk/GuGJKType.h index a0099e2fd..7a49ca770 100644 --- a/physx/source/geomutils/src/gjk/GuGJKType.h +++ b/physx/source/geomutils/src/gjk/GuGJKType.h @@ -151,7 +151,7 @@ namespace Gu virtual Ps::aos::Vec3V getCenter() const { return mAToB.transform(getConvex().getCenter()); } - PX_FORCE_INLINE Ps::aos::PsMatTransformV& getRelativeTransform(){ return mAToB; } + PX_FORCE_INLINE Ps::aos::PsMatTransformV& getRelativeTransform(){ return const_cast(mAToB); } //ML: we can't force inline function, otherwise win modern will throw compiler error PX_INLINE RelativeConvex::Type > getGjkConvex() const From 56b2bf6d6278d0dd943920ee7a3e1a017e303f69 Mon Sep 17 00:00:00 2001 From: Sankhesh Jhaveri Date: Mon, 13 Jan 2020 12:18:51 -0500 Subject: [PATCH 3/3] Fix 'passing argument to restrict-qualified parameter aliase' warnings --- physx/source/geomutils/src/mesh/GuBV4Build.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/physx/source/geomutils/src/mesh/GuBV4Build.cpp b/physx/source/geomutils/src/mesh/GuBV4Build.cpp index 9d4b84653..16cf53fd1 100644 --- a/physx/source/geomutils/src/mesh/GuBV4Build.cpp +++ b/physx/source/geomutils/src/mesh/GuBV4Build.cpp @@ -294,8 +294,10 @@ bool AABBTree::buildFromMesh(SourceMesh& mesh, PxU32 limit) mPool->mNodePrimitives = mIndices; mPool->mNbPrimitives = nbBoxes; + // Workaround "restrict-qualified parameter aliases" warning + AABBTreeNode* mPoolA = mPool; // Build the hierarchy - local_BuildHierarchy(mPool, boxes, centers, Stats, mPool, limit); + local_BuildHierarchy(mPoolA, boxes, centers, Stats, mPool, limit); // Get back total number of nodes mTotalNbNodes = Stats.getCount();