ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/arch.C
(Generate patch)

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.114 by root, Fri Nov 18 04:46:35 2016 UTC vs.
Revision 1.115 by root, Sat Nov 17 23:33:17 2018 UTC

… …
21 * 21 *
22 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25#include <cassert> 25#include <cassert>
26#include <functional>
27
28#include <flat_hash_map.hpp>
26 29
27#include <global.h> 30#include <global.h>
28
29#include <functional>
30#include <unordered_map>
31 31
32archetype *loading_arch; // ugly flag to object loader etc. to suppress/request special processing 32archetype *loading_arch; // ugly flag to object loader etc. to suppress/request special processing
33arch_ptr archetype::empty; 33arch_ptr archetype::empty;
34 34
35// the hashtable 35// the hashtable
36typedef std::unordered_map 36typedef ska::flat_hash_map<
37 <
38 const char *, 37 const char *,
39 arch_ptr, 38 arch_ptr,
40 str_hash, 39 str_hash,
41 str_equal, 40 str_equal,
42 slice_allocator< std::pair<const char *const, arch_ptr> > 41 slice_allocator< std::pair<const char *const, arch_ptr> >
43 > HT; 42> HT;
44 43
45static HT ht (10000); 44static HT ht (10000);
46archvec archetypes; 45archvec archetypes;
47static unordered_vector<archetype *> allarch; 46static unordered_vector<archetype *> allarch;
48static int dirtycnt; 47static int dirtycnt;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines