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

Comparing deliantra/server/common/shstr.C (file contents):
Revision 1.50 by root, Wed Nov 16 23:41:59 2016 UTC vs.
Revision 1.53 by root, Sat Nov 17 23:40:00 2018 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 5 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * 6 *
6 * Deliantra is free software: you can redistribute it and/or modify it under 7 * Deliantra is free software: you can redistribute it and/or modify it under
7 * the terms of the Affero GNU General Public License as published by the 8 * the terms of the Affero GNU General Public License as published by the
8 * Free Software Foundation, either version 3 of the License, or (at your 9 * Free Software Foundation, either version 3 of the License, or (at your
25 */ 26 */
26 27
27#include <cstring> 28#include <cstring>
28#include <cstdlib> 29#include <cstdlib>
29#include <glib.h> 30#include <glib.h>
30#include <tr1/unordered_set>
31 31
32#include <flat_hash_map.hpp>
33
32#include "global.h" 34#include <global.h>
33 35
34size_t shstr_alloc; 36size_t shstr_alloc;
35 37
36typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *> > HT; 38typedef ska::flat_hash_set<const char *, str_hash, str_equal, slice_allocator<const char *>> HT;
37 39
38static HT ht; 40static HT ht;
39static int next_gc; 41static int next_gc;
40 42
41#define NUM_INT 3 43#define NUM_INT 3

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines