diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-01-07 15:08:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-07 15:08:41 +0100 |
| commit | dab650fcaa3eb37deee5118d678a3763ac78a58a (patch) | |
| tree | 3131df01280f91a61b4721eed132a5b6b21881ba /thirdparty/bullet/Bullet3Common/shared/b3PlatformDefinitions.h | |
| parent | a3a537c2cf86ff4bf82385bbd17606654f8013c4 (diff) | |
| parent | 22b7c9dfa80d0f7abca40f061865c2ab3c136a74 (diff) | |
Merge pull request #24740 from OBKF/update-bullet-physics
Update Bullet physics to commit 126b676
Diffstat (limited to 'thirdparty/bullet/Bullet3Common/shared/b3PlatformDefinitions.h')
| -rw-r--r-- | thirdparty/bullet/Bullet3Common/shared/b3PlatformDefinitions.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/thirdparty/bullet/Bullet3Common/shared/b3PlatformDefinitions.h b/thirdparty/bullet/Bullet3Common/shared/b3PlatformDefinitions.h index 1c133fb088..b72bee9310 100644 --- a/thirdparty/bullet/Bullet3Common/shared/b3PlatformDefinitions.h +++ b/thirdparty/bullet/Bullet3Common/shared/b3PlatformDefinitions.h @@ -8,18 +8,18 @@ struct MyTest #ifdef __cplusplus //#define b3ConstArray(a) const b3AlignedObjectArray<a>& -#define b3ConstArray(a) const a* +#define b3ConstArray(a) const a * #define b3AtomicInc(a) ((*a)++) -inline int b3AtomicAdd (volatile int *p, int val) +inline int b3AtomicAdd(volatile int *p, int val) { int oldValue = *p; - int newValue = oldValue+val; + int newValue = oldValue + val; *p = newValue; return oldValue; } -#define __global +#define __global #define B3_STATIC static #else @@ -27,7 +27,7 @@ inline int b3AtomicAdd (volatile int *p, int val) #define B3_LARGE_FLOAT 1e18f #define B3_INFINITY 1e18f #define b3Assert(a) -#define b3ConstArray(a) __global const a* +#define b3ConstArray(a) __global const a * #define b3AtomicInc atomic_inc #define b3AtomicAdd atomic_add #define b3Fabs fabs |