diff options
| author | Marijn Tamis <[email protected]> | 2019-04-29 16:21:42 +0200 |
|---|---|---|
| committer | Marijn Tamis <[email protected]> | 2019-04-29 16:21:42 +0200 |
| commit | 90963f4c0a38c705fe85101f2be5fdd09911b10f (patch) | |
| tree | 34ca6c9e642ce4998612e3ee5bf3264a57c21277 /NvCloth/src/dx/DxDeviceVector.h | |
| parent | 1.1.6 Release. (diff) | |
| download | nvcloth-90963f4c0a38c705fe85101f2be5fdd09911b10f.tar.xz nvcloth-90963f4c0a38c705fe85101f2be5fdd09911b10f.zip | |
Fix potential namespace issues when using NvCloth together with PhysX.
Diffstat (limited to 'NvCloth/src/dx/DxDeviceVector.h')
| -rw-r--r-- | NvCloth/src/dx/DxDeviceVector.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/NvCloth/src/dx/DxDeviceVector.h b/NvCloth/src/dx/DxDeviceVector.h index 17b7d6e..d045633 100644 --- a/NvCloth/src/dx/DxDeviceVector.h +++ b/NvCloth/src/dx/DxDeviceVector.h @@ -257,7 +257,7 @@ class DxDeviceVector } template <typename Alloc> - DxDeviceVector& operator = (const physx::shdfnd::Array<T, Alloc>& other) + DxDeviceVector& operator = (const ps::Array<T, Alloc>& other) { assign(other.begin(), other.end()); return *this; @@ -316,8 +316,8 @@ class DxDeviceVector void swap(DxDeviceVector& other) { - physx::shdfnd::swap(mBuffer, other.mBuffer); - physx::shdfnd::swap(mSize, other.mSize); + nv::cloth::swap(mBuffer, other.mBuffer); + nv::cloth::swap(mSize, other.mSize); } T* map(D3D11_MAP mapType) |