diff options
| author | p0358 <p0358@users.noreply.github.com> | 2021-12-31 22:46:45 +0100 |
|---|---|---|
| committer | p0358 <p0358@users.noreply.github.com> | 2021-12-31 22:46:45 +0100 |
| commit | 9b13df7bc6f4c09c3fdab27cd51fe76d30b756b8 (patch) | |
| tree | d273fbc7942b46497f056fd9c68b8b21e6d19fee /NorthstarDedicatedTest/memalloc.h | |
| parent | dcba96bcc4b02639e859b0dcdc863391cb54684f (diff) | |
| download | NorthstarLauncher-9b13df7bc6f4c09c3fdab27cd51fe76d30b756b8.tar.gz NorthstarLauncher-9b13df7bc6f4c09c3fdab27cd51fe76d30b756b8.zip | |
some post-merge changes combined with my local changes
Diffstat (limited to 'NorthstarDedicatedTest/memalloc.h')
| -rw-r--r-- | NorthstarDedicatedTest/memalloc.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/NorthstarDedicatedTest/memalloc.h b/NorthstarDedicatedTest/memalloc.h index b98fe3c8..92ab9672 100644 --- a/NorthstarDedicatedTest/memalloc.h +++ b/NorthstarDedicatedTest/memalloc.h @@ -35,8 +35,6 @@ public: static void Free(void* ptr) { _free_base(ptr); } }; -static SourceAllocator g_SourceAllocator; - typedef rapidjson::GenericDocument<rapidjson::UTF8<>, rapidjson::MemoryPoolAllocator<SourceAllocator>, SourceAllocator> rapidjson_document; //typedef rapidjson::GenericDocument<rapidjson::UTF8<>, SourceAllocator, SourceAllocator> rapidjson_document; //typedef rapidjson::Document rapidjson_document; |