--- deliantra/server/include/face.h 2012/11/11 05:53:12 1.43 +++ deliantra/server/include/face.h 2018/11/17 23:33:18 1.46 @@ -1,7 +1,7 @@ /* * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team * * Deliantra is free software: you can redistribute it and/or modify it under * the terms of the Affero GNU General Public License as published by the @@ -24,7 +24,8 @@ #define FACE_H__ #include -#include + +#include "flat_hash_map.hpp" #define CHKSUM_MAXLEN 15 #define MAX_FACES 65535 // we reserve face #65535 @@ -78,7 +79,7 @@ put (k); } -typedef std::tr1::unordered_map > > facehash_t; +typedef ska::flat_hash_map>> facehash_t; extern facehash_t facehash; extern std::vector faces; @@ -120,7 +121,7 @@ void resize (int new_size); }; -typedef std::tr1::unordered_map > > animhash_t; +typedef ska::flat_hash_map>> animhash_t; extern std::vector animations;