From 90963f4c0a38c705fe85101f2be5fdd09911b10f Mon Sep 17 00:00:00 2001
From: Marijn Tamis <mtamis@nvidia.com>
Date: Mon, 29 Apr 2019 16:21:42 +0200
Subject: Fix potential namespace issues when using NvCloth together with
 PhysX.

---
 NvCloth/extensions/src/ClothGeodesicTetherCooker.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'NvCloth/extensions/src/ClothGeodesicTetherCooker.cpp')

diff --git a/NvCloth/extensions/src/ClothGeodesicTetherCooker.cpp b/NvCloth/extensions/src/ClothGeodesicTetherCooker.cpp
index 7557389..983490b 100644
--- a/NvCloth/extensions/src/ClothGeodesicTetherCooker.cpp
+++ b/NvCloth/extensions/src/ClothGeodesicTetherCooker.cpp
@@ -146,7 +146,7 @@ namespace
 			if (!(begin[parent] < begin[current]))
 				break;
 
-			shdfnd::swap(begin[parent], begin[current]);
+			ps::swap(begin[parent], begin[current]);
 			current = parent;
 		}
 	}
@@ -158,7 +158,7 @@ namespace
 		T* begin = heap.begin();
 		T* end = heap.end();
 
-		shdfnd::swap(begin[0], end[-1]); // exchange elements
+		ps::swap(begin[0], end[-1]); // exchange elements
 
 		// shift down
 		end--;
@@ -173,7 +173,7 @@ namespace
 			if (!(begin[current] < begin[child]))
 				break;
 
-			shdfnd::swap(begin[current], begin[child]);
+			ps::swap(begin[current], begin[child]);
 			current = child;
 		}
 
@@ -237,7 +237,7 @@ namespace
 			: mFromVertIndex(v0), mToVertIndex(v1), mHalfEdgeIndex(halfEdgeIndex)
 		{
 			if(mFromVertIndex > mToVertIndex)
-				shdfnd::swap(mFromVertIndex, mToVertIndex);
+				ps::swap(mFromVertIndex, mToVertIndex);
 		}
 
 		bool operator<(const MeshEdge& e) const
@@ -635,7 +635,7 @@ PxU32 ClothGeodesicTetherCooker::findTriNeighbors()
 		edges.pushBack(MeshEdge(int(i2), int(i0), int(3*i+2)));
 	}
 
-	shdfnd::sort(edges.begin(), edges.size(), shdfnd::Less<MeshEdge>(), NonTrackingAllocator());
+	ps::sort(edges.begin(), edges.size(), ps::Less<MeshEdge>(), ps::NonTrackingAllocator());
 
 	int numEdges = int(edges.size());
 	for(int i=0; i < numEdges; )
@@ -680,7 +680,7 @@ void ClothGeodesicTetherCooker::findVertTriNeighbors()
 		vertTriangles.pushBack(VertTriangle(int(mIndices[PxU32(3*i+2)]), i));
 	}
 
-	shdfnd::sort(vertTriangles.begin(), vertTriangles.size(), shdfnd::Less<VertTriangle>(), NonTrackingAllocator());
+	ps::sort(vertTriangles.begin(), vertTriangles.size(), ps::Less<VertTriangle>(), ps::NonTrackingAllocator());
 	mFirstVertTriAdj.resize(mNumParticles);
 	mVertTriAdjs.reserve(mIndices.size());
 
-- 
cgit v1.2.3