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/ps/windows/PsWindowsAtomic.cpp | |
| 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/ps/windows/PsWindowsAtomic.cpp')
| -rw-r--r-- | NvCloth/src/ps/windows/PsWindowsAtomic.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/NvCloth/src/ps/windows/PsWindowsAtomic.cpp b/NvCloth/src/ps/windows/PsWindowsAtomic.cpp index c78728f..fa9c115 100644 --- a/NvCloth/src/ps/windows/PsWindowsAtomic.cpp +++ b/NvCloth/src/ps/windows/PsWindowsAtomic.cpp @@ -30,9 +30,13 @@ #include "PsWindowsInclude.h" #include "NvCloth/ps/PsAtomic.h" -namespace physx +/** \brief NVidia namespace */ +namespace nv { -namespace shdfnd +/** \brief nvcloth namespace */ +namespace cloth +{ +namespace ps { int32_t atomicExchange(volatile int32_t* val, int32_t val2) @@ -92,5 +96,6 @@ int32_t atomicMax(volatile int32_t* val, int32_t val2) return newValue; } -} // namespace shdfnd -} // namespace physx +} // namespace ps +} // namespace cloth +} // namespace nv |