diff options
author | 2015-02-14 12:53:08 +0100 | |
---|---|---|
committer | 2015-02-14 12:53:08 +0100 | |
commit | 8afe66fc634116a654becad7d9f7f53ab199da41 (patch) | |
tree | 8c3b7889cba36cbcd2b9d6d8d6b3df87dd495cb2 /3rdparty/bgfx/examples/common/entry/entry_p.h | |
parent | 20b68364f7fa3bf692e50504fecf9bc5825eada3 (diff) |
Updated BGFX, BX and GENie to latest (nw)
Diffstat (limited to '3rdparty/bgfx/examples/common/entry/entry_p.h')
-rw-r--r-- | 3rdparty/bgfx/examples/common/entry/entry_p.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/3rdparty/bgfx/examples/common/entry/entry_p.h b/3rdparty/bgfx/examples/common/entry/entry_p.h index 09fa203bde5..39a289ed737 100644 --- a/3rdparty/bgfx/examples/common/entry/entry_p.h +++ b/3rdparty/bgfx/examples/common/entry/entry_p.h @@ -6,6 +6,8 @@ #ifndef ENTRY_PRIVATE_H_HEADER_GUARD #define ENTRY_PRIVATE_H_HEADER_GUARD +#define TINYSTL_ALLOCATOR entry::TinyStlAllocator + #include <bx/spscqueue.h> #include "entry.h" @@ -37,11 +39,21 @@ # error "Both ENTRY_DEFAULT_WIDTH and ENTRY_DEFAULT_HEIGHT must be defined." #endif // ENTRY_DEFAULT_WIDTH +#ifndef ENTRY_CONFIG_IMPLEMENT_DEFAULT_ALLOCATOR +# define ENTRY_CONFIG_IMPLEMENT_DEFAULT_ALLOCATOR 1 +#endif // ENTRY_CONFIG_IMPLEMENT_DEFAULT_ALLOCATOR + #define ENTRY_IMPLEMENT_EVENT(_class, _type) \ _class(WindowHandle _handle) : Event(_type, _handle) {} namespace entry { + struct TinyStlAllocator + { + static void* static_allocate(size_t _bytes); + static void static_deallocate(void* _ptr, size_t /*_bytes*/); + }; + int main(int _argc, char** _argv); struct Event |