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.49 by root, Mon Oct 29 23:55:52 2012 UTC vs.
Revision 1.51 by root, Fri Nov 18 04:44:13 2016 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 (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / 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 * 5 *
6 * Deliantra is free software: you can redistribute it and/or modify it under 6 * 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 7 * 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 8 * Free Software Foundation, either version 3 of the License, or (at your
9 * option) any later version. 9 * option) any later version.
25 */ 25 */
26 26
27#include <cstring> 27#include <cstring>
28#include <cstdlib> 28#include <cstdlib>
29#include <glib.h> 29#include <glib.h>
30#include <tr1/unordered_set> 30#include <unordered_set>
31 31
32#include "global.h" 32#include "global.h"
33 33
34size_t shstr_alloc; 34size_t shstr_alloc;
35 35
36typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *> > HT; 36typedef std::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *> > HT;
37 37
38static HT ht; 38static HT ht;
39static int next_gc; 39static int next_gc;
40 40
41#define NUM_INT 3 41#define NUM_INT 3

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines