From f701e5f635eb03df2055279e58e86f90e961b0ab Mon Sep 17 00:00:00 2001 From: Paul Norman Date: Sat, 18 Jul 2015 14:44:16 -0700 Subject: [PATCH] Replace boost::unordered_map with std::unordered_map --- middle-pgsql.cpp | 6 +++--- osmdata.cpp | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/middle-pgsql.cpp b/middle-pgsql.cpp index ceb363af8..c3171898e 100644 --- a/middle-pgsql.cpp +++ b/middle-pgsql.cpp @@ -51,8 +51,8 @@ using namespace std; #include #include #include +#include #include -#include enum table_id { t_node, t_way, t_rel @@ -401,7 +401,7 @@ size_t middle_pgsql_t::local_nodes_get_list(nodelist_t &out, const idlist_t nds) int countPG = PQntuples(res); //store the pg results in a hashmap and telling it how many we expect - boost::unordered_map pg_nodes(countPG); + std::unordered_map pg_nodes(countPG); for (int i = 0; i < countPG; i++) { osmid_t id = strtoosmid(PQgetvalue(res, i, 0), nullptr, 10); @@ -427,7 +427,7 @@ size_t middle_pgsql_t::local_nodes_get_list(nodelist_t &out, const idlist_t nds) size_t wrtidx = 0; for (size_t i = 0; i < nds.size(); ++i) { if (std::isnan(out[i].lat)) { - boost::unordered_map::iterator found = pg_nodes.find(nds[i]); + std::unordered_map::iterator found = pg_nodes.find(nds[i]); if(found != pg_nodes.end()) { out[wrtidx] = found->second; ++wrtidx; diff --git a/osmdata.cpp b/osmdata.cpp index 6e3454f9d..7fba46a82 100644 --- a/osmdata.cpp +++ b/osmdata.cpp @@ -4,7 +4,6 @@ #include "node-ram-cache.hpp" #include -#include #include #include