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/Bullet3Serialize/Bullet2FileLoader/b3Common.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/Bullet3Serialize/Bullet2FileLoader/b3Common.h')
-rw-r--r-- | thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3Common.h | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3Common.h b/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3Common.h index 2792d84033..5884fad4d6 100644 --- a/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3Common.h +++ b/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3Common.h @@ -16,24 +16,25 @@ subject to the following restrictions: #ifndef __BCOMMON_H__ #define __BCOMMON_H__ - #include <assert.h> //#include "bLog.h" #include "Bullet3Common/b3AlignedObjectArray.h" #include "Bullet3Common/b3HashMap.h" -namespace bParse { - - class bMain; - class bFileData; - class bFile; - class bDNA; - - // delete void* undefined - typedef struct bStructHandle {int unused;}bStructHandle; - typedef b3AlignedObjectArray<bStructHandle*> bListBasePtr; - typedef b3HashMap<b3HashPtr, bStructHandle*> bPtrMap; -} - - -#endif//__BCOMMON_H__ +namespace bParse +{ +class bMain; +class bFileData; +class bFile; +class bDNA; + +// delete void* undefined +typedef struct bStructHandle +{ + int unused; +} bStructHandle; +typedef b3AlignedObjectArray<bStructHandle*> bListBasePtr; +typedef b3HashMap<b3HashPtr, bStructHandle*> bPtrMap; +} // namespace bParse + +#endif //__BCOMMON_H__ |