diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-04-11 17:48:49 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2019-04-11 18:20:32 +0200 |
| commit | 668439d16a5c30587ab77461fb3211306ad62587 (patch) | |
| tree | 406ed91ea98191074cc629733727884d3e8af07a /thirdparty/vhacd/inc/btAlignedObjectArray.h | |
| parent | 531b1588973ef0d0631e06353ca65131d97c00ae (diff) | |
| download | redot-engine-668439d16a5c30587ab77461fb3211306ad62587.tar.gz | |
vhacd: Reapply downstream changes to namespace conflicting bullet code
Also adding a patch to easily identify and reapply them.
Diffstat (limited to 'thirdparty/vhacd/inc/btAlignedObjectArray.h')
| -rw-r--r-- | thirdparty/vhacd/inc/btAlignedObjectArray.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/thirdparty/vhacd/inc/btAlignedObjectArray.h b/thirdparty/vhacd/inc/btAlignedObjectArray.h index e6620adf6f..1ce03d21bc 100644 --- a/thirdparty/vhacd/inc/btAlignedObjectArray.h +++ b/thirdparty/vhacd/inc/btAlignedObjectArray.h @@ -38,6 +38,10 @@ subject to the following restrictions: #include <new> //for placement new #endif //BT_USE_PLACEMENT_NEW +// -- GODOT start -- +namespace VHACD { +// -- GODOT end -- + ///The btAlignedObjectArray template class uses a subset of the stl::vector interface for its methods ///It is developed to replace stl::vector to avoid portability issues, including STL alignment issues to add SIMD/SSE data template <typename T> @@ -445,4 +449,8 @@ public: } }; +// -- GODOT start -- +}; // namespace VHACD +// -- GODOT end -- + #endif //BT_OBJECT_ARRAY__ |