aboutsummaryrefslogtreecommitdiffstats
path: root/frontend
diff options
context:
space:
mode:
authorClifford Wolf <clifford@clifford.at>2018-06-11 19:56:33 +0200
committerClifford Wolf <clifford@clifford.at>2018-06-11 19:56:33 +0200
commitac6748238015cca1a107d99bf0f175c45eda7b2f (patch)
tree4bd5042c874eb6b32431a47c00f8a9cdcc0ce6cb /frontend
parentf63eec034f6ed133713600a426daaa8845d58c03 (diff)
downloadnextpnr-ac6748238015cca1a107d99bf0f175c45eda7b2f.tar.gz
nextpnr-ac6748238015cca1a107d99bf0f175c45eda7b2f.tar.bz2
nextpnr-ac6748238015cca1a107d99bf0f175c45eda7b2f.zip
Remove pool, dict, vector namespace aliases
Signed-off-by: Clifford Wolf <clifford@clifford.at>
Diffstat (limited to 'frontend')
-rw-r--r--frontend/json/jsonparse.cc9
1 files changed, 5 insertions, 4 deletions
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;