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/unix | |
| 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/unix')
| -rw-r--r-- | NvCloth/src/ps/unix/PsUnixAtomic.cpp | 14 | ||||
| -rw-r--r-- | NvCloth/src/ps/unix/PsUnixFPU.h | 4 | ||||
| -rw-r--r-- | NvCloth/src/ps/unix/PsUnixMutex.cpp | 14 |
3 files changed, 20 insertions, 12 deletions
diff --git a/NvCloth/src/ps/unix/PsUnixAtomic.cpp b/NvCloth/src/ps/unix/PsUnixAtomic.cpp index 376f795..19167cd 100644 --- a/NvCloth/src/ps/unix/PsUnixAtomic.cpp +++ b/NvCloth/src/ps/unix/PsUnixAtomic.cpp @@ -35,9 +35,13 @@ #define PAUSE() #endif -namespace physx +/** \brief NVidia namespace */ +namespace nv { -namespace shdfnd +/** \brief nvcloth namespace */ +namespace cloth +{ +namespace ps { void* atomicCompareExchangePointer(volatile void** dest, void* exch, void* comp) @@ -97,6 +101,6 @@ int32_t atomicExchange(volatile int32_t* val, int32_t val2) return oldVal; } - -} // namespace shdfnd -} // namespace physx +} // namespace ps +} // namespace cloth +} // namespace nv diff --git a/NvCloth/src/ps/unix/PsUnixFPU.h b/NvCloth/src/ps/unix/PsUnixFPU.h index edd5522..3f98a69 100644 --- a/NvCloth/src/ps/unix/PsUnixFPU.h +++ b/NvCloth/src/ps/unix/PsUnixFPU.h @@ -44,7 +44,7 @@ #endif -PX_INLINE physx::shdfnd::SIMDGuard::SIMDGuard() +PX_INLINE nv::cloth::ps::SIMDGuard::SIMDGuard() { #if !PX_EMSCRIPTEN && (PX_X86 || PX_X64) mControlWord = _mm_getcsr(); @@ -53,7 +53,7 @@ PX_INLINE physx::shdfnd::SIMDGuard::SIMDGuard() #endif } -PX_INLINE physx::shdfnd::SIMDGuard::~SIMDGuard() +PX_INLINE nv::cloth::ps::SIMDGuard::~SIMDGuard() { #if !PX_EMSCRIPTEN && (PX_X86 || PX_X64) // restore control word and clear exception flags diff --git a/NvCloth/src/ps/unix/PsUnixMutex.cpp b/NvCloth/src/ps/unix/PsUnixMutex.cpp index 23b6549..f40d294 100644 --- a/NvCloth/src/ps/unix/PsUnixMutex.cpp +++ b/NvCloth/src/ps/unix/PsUnixMutex.cpp @@ -39,9 +39,13 @@ #include <pthread.h> -namespace physx +/** \brief NVidia namespace */ +namespace nv { -namespace shdfnd +/** \brief nvcloth namespace */ +namespace cloth +{ +namespace ps { namespace @@ -165,6 +169,6 @@ void ReadWriteLock::unlockWriter() { mImpl->mutex.unlock(); } - -} // namespace shdfnd -} // namespace physx +} // namespace ps +} // namespace cloth +} // namespace nv |