commit 1ffebd76884330b9ddaa8356da46a2254793bf32
parent 1408928312147daf5abd9e8406988d15d290b50b
Author: Kyle Milz <kyle@getaddrinfo.net>
Date: Mon, 21 Mar 2016 20:52:04 -0600
viewer: use unordered_map instead of hash_map
Diffstat:
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/viewer/demo-font.cc b/viewer/demo-font.cc
@@ -16,20 +16,12 @@
* Google Author(s): Behdad Esfahbod
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "demo-font.h"
-
#include "glyphy/glyphy-freetype.h"
-#include <ext/hash_map>
-
-using namespace __gnu_cxx; /* This is ridiculous */
-
+#include <unordered_map>
-typedef hash_map<unsigned int, glyph_info_t> glyph_cache_t;
+typedef std::unordered_map<unsigned int, glyph_info_t> glyph_cache_t;
struct demo_font_t {
unsigned int refcount;
@@ -103,7 +95,7 @@ demo_font_get_atlas (demo_font_t *font)
static glyphy_bool_t
accumulate_endpoint (glyphy_arc_endpoint_t *endpoint,
- vector<glyphy_arc_endpoint_t> *endpoints)
+ std::vector<glyphy_arc_endpoint_t> *endpoints)
{
endpoints->push_back (*endpoint);
return true;
@@ -141,7 +133,7 @@ encode_ft_glyph (demo_font_t *font,
unsigned int upem = face->units_per_EM;
double tolerance = upem * tolerance_per_em; /* in font design units */
double faraway = double (upem) / (MIN_FONT_SIZE * M_SQRT2);
- vector<glyphy_arc_endpoint_t> endpoints;
+ std::vector<glyphy_arc_endpoint_t> endpoints;
glyphy_arc_accumulator_reset (font->acc);
glyphy_arc_accumulator_set_tolerance (font->acc, tolerance);