diff options
| author | sschirm <[email protected]> | 2017-02-27 16:40:12 +0100 |
|---|---|---|
| committer | sschirm <[email protected]> | 2017-03-01 18:04:26 +0100 |
| commit | 7840347c32755e94a807f978f1cbb558717ac8cf (patch) | |
| tree | 295cd3ca93a45f8fcc43cf3cbf3887c0e0c5526b /PxShared/include/foundation/unix/PxUnixIntrinsics.h | |
| parent | Pre-release comments marking end of beta. (diff) | |
| download | physx-3.4-7840347c32755e94a807f978f1cbb558717ac8cf.tar.xz physx-3.4-7840347c32755e94a807f978f1cbb558717ac8cf.zip | |
PhysX 3.4, APEX 1.4 final release @21757769v3.4.0-rc-2
Diffstat (limited to 'PxShared/include/foundation/unix/PxUnixIntrinsics.h')
| -rw-r--r-- | PxShared/include/foundation/unix/PxUnixIntrinsics.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/PxShared/include/foundation/unix/PxUnixIntrinsics.h b/PxShared/include/foundation/unix/PxUnixIntrinsics.h index 7b9b9f37..351c83c1 100644 --- a/PxShared/include/foundation/unix/PxUnixIntrinsics.h +++ b/PxShared/include/foundation/unix/PxUnixIntrinsics.h @@ -37,8 +37,8 @@ #error "This file should only be included by Unix builds!!" #endif -#if PX_LINUX && PX_ARM - // Linux ARM toolchain can somehow end up including cmath header after math.h, which will undef a bunch of macros and place them in std namespace +#if PX_LINUX && !defined(__CUDACC__) + // Linux and CUDA compilation does not work with std::isfnite, as it is not marked as CUDA callable #ifndef isfinite #define isfinite std::isfinite #endif |