… | … | ||
---|---|---|---|
30 | 30 | ||
31 | #include "global.h" | 31 | #include "global.h" |
32 | 32 | ||
33 | size_t shstr_alloc; | 33 | size_t shstr_alloc; |
34 | 34 | ||
35 | typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *>, true> HT; | 35 | typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *> > HT; |
36 | 36 | ||
37 | static HT ht; | 37 | static HT ht; |
38 | static int next_gc; | 38 | static int next_gc; |
39 | 39 | ||
40 | static const char * | 40 | static const char * |
… | … | ||
135 | } | 135 | } |
136 | 136 | ||
137 | curpos = *i; | 137 | curpos = *i; |
138 | } | 138 | } |
139 | 139 | ||
140 | const shstr shstr_null; | ||
141 | |||
140 | // declare these here to get correct initialisation order | 142 | // declare these here to get correct initialisation order |
141 | #define def(str) const shstr shstr_ ## str (# str); | 143 | #define def(str) const shstr shstr_ ## str (# str); |
142 | # include "shstrinc.h" | 144 | # include "shstrinc.h" |
143 | #undef def | 145 | #undef def |
144 | 146 |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |