Compare commits

...

2 Commits

2 changed files with 6 additions and 3 deletions

View File

@ -4,8 +4,11 @@
#if !defined(MIJIN_INTERNAL_CONFIG_HPP_INCLUDED) #if !defined(MIJIN_INTERNAL_CONFIG_HPP_INCLUDED)
#define MIJIN_INTERNAL_CONFIG_HPP_INCLUDED 1 #define MIJIN_INTERNAL_CONFIG_HPP_INCLUDED 1
#define MIJIN_QUOTED_ACTUAL(x) #x
#define MIJIN_QUOTED(x) MIJIN_QUOTED_ACTUAL(x)
#if defined(MIJIN_CONFIG_HEADER) #if defined(MIJIN_CONFIG_HEADER)
#include MIJIN_CONFIG_HEADER #include MIJIN_QUOTED(MIJIN_CONFIG_HEADER)
#endif #endif
#if !defined(MIJIN_DEFAULT_ALLOCATOR) #if !defined(MIJIN_DEFAULT_ALLOCATOR)

View File

@ -21,8 +21,8 @@ struct MemoryFile
}; };
struct MemoryFolder struct MemoryFolder
{ {
VectorMap<std::string, MemoryFile> files; VectorMap<std::string, MemoryFile, std::allocator<std::string>, std::allocator<MemoryFile>> files; // TODO: make the FS library allocator aware
VectorMap<std::string, MemoryFolder> folders; VectorMap<std::string, MemoryFolder, std::allocator<std::string>, std::allocator<MemoryFolder>> folders;
}; };
} }