From ac6748238015cca1a107d99bf0f175c45eda7b2f Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Mon, 11 Jun 2018 19:56:33 +0200
Subject: Remove pool, dict, vector namespace aliases

Signed-off-by: Clifford Wolf <clifford@clifford.at>
---
 frontend/json/jsonparse.cc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'frontend/json/jsonparse.cc')

diff --git a/frontend/json/jsonparse.cc b/frontend/json/jsonparse.cc
index 761ad47e..fd44246a 100644
--- a/frontend/json/jsonparse.cc
+++ b/frontend/json/jsonparse.cc
@@ -45,9 +45,9 @@ struct JsonNode
     char type; // S=String, N=Number, A=Array, D=Dict
     string data_string;
     int data_number;
-    vector<JsonNode *> data_array;
-    dict<string, JsonNode *> data_dict;
-    vector<string> data_dict_keys;
+    std::vector<JsonNode *> data_array;
+    std::unordered_map<string, JsonNode *> data_dict;
+    std::vector<string> data_dict_keys;
 
     JsonNode(std::istream &f)
     {
@@ -314,7 +314,8 @@ bool is_blackbox(JsonNode *node)
 
 void json_import_cell_params(Design *design, string &modname, CellInfo *cell,
                              JsonNode *param_node,
-                             dict<IdString, std::string> *dest, int param_id)
+                             std::unordered_map<IdString, std::string> *dest,
+                             int param_id)
 {
     //
     JsonNode *param;
-- 
cgit v1.2.3