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/PsFPU.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/ps/PsFPU.h')
| -rw-r--r-- | NvCloth/src/ps/PsFPU.h | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/NvCloth/src/ps/PsFPU.h b/NvCloth/src/ps/PsFPU.h index 82b7ff2..1cb45c0 100644 --- a/NvCloth/src/ps/PsFPU.h +++ b/NvCloth/src/ps/PsFPU.h @@ -48,10 +48,15 @@ #define PX_SUPPORT_GUARDS (PX_WINDOWS_FAMILY || PX_XBOXONE || (PX_LINUX && (PX_X86 || PX_X64)) || PX_PS4 || PX_OSX) -namespace physx +/** \brief NVidia namespace */ +namespace nv { -namespace shdfnd +/** \brief nvcloth namespace */ +namespace cloth { +namespace ps +{ + // sets the default SDK state for scalar and SIMD units class NV_CLOTH_IMPORT FPUGuard { @@ -84,18 +89,19 @@ NV_CLOTH_IMPORT void enableFPExceptions(); */ NV_CLOTH_IMPORT void disableFPExceptions(); -} // namespace shdfnd -} // namespace physx +} // namespace ps +} // namespace cloth +} // namespace nv #if PX_WINDOWS_FAMILY || PX_XBOXONE #include "windows/PsWindowsFPU.h" #elif (PX_LINUX && PX_SSE2) || PX_PS4 || PX_OSX #include "unix/PsUnixFPU.h" #else -PX_INLINE physx::shdfnd::SIMDGuard::SIMDGuard() +PX_INLINE nv::cloth::ps::SIMDGuard::SIMDGuard() { } -PX_INLINE physx::shdfnd::SIMDGuard::~SIMDGuard() +PX_INLINE nv::cloth::ps::SIMDGuard::~SIMDGuard() { } #endif |