scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2024-11-28 10:35:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1 from mendsley/master

Browse source 
Updating bgfx to use new tinystl allocator macro
This commit is contained in:
Branimir Karadžić 2012-06-29 20:01:48 -07:00
commit d3ef0e407a
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/bgfx.cpp
View file

@ -12,12 +12,12 @@ HWND g_bgfxHwnd = NULL;
#if BGFX_CONFIG_USE_TINYSTL
namespace tinystl
{
void* allocator::static_allocate(size_t _bytes)
void* bgfx_allocator::static_allocate(size_t _bytes)
{
return bgfx::g_realloc(NULL, _bytes);
}
void allocator::static_deallocate(void* _ptr, size_t /*_bytes*/)
void bgfx_allocator::static_deallocate(void* _ptr, size_t /*_bytes*/)
{
bgfx::g_free(_ptr);
}

5
src/bgfx_p.h
View file

@ -79,15 +79,16 @@ extern HWND g_bgfxHwnd;
#define BGFX_MAGIC MAKEFOURCC('B','G','F','X')
#if BGFX_CONFIG_USE_TINYSTL
namespace tinystl
{
struct allocator
struct bgfx_allocator
{
static void* static_allocate(size_t _bytes);
static void static_deallocate(void* _ptr, size_t /*_bytes*/);
};
} // namespace tinystl
# define TINYSTL_ALLOCATOR_H
# define TINYSTL_ALLOCATOR tinystl::bgfx_allocator
# include <TINYSTL/string.h>
# include <TINYSTL/unordered_map.h>