diff options
author | Clifford Wolf <clifford@clifford.at> | 2018-06-11 19:56:33 +0200 |
---|---|---|
committer | Clifford Wolf <clifford@clifford.at> | 2018-06-11 19:56:33 +0200 |
commit | ac6748238015cca1a107d99bf0f175c45eda7b2f (patch) | |
tree | 4bd5042c874eb6b32431a47c00f8a9cdcc0ce6cb /common/design.h | |
parent | f63eec034f6ed133713600a426daaa8845d58c03 (diff) | |
download | nextpnr-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 'common/design.h')
-rw-r--r-- | common/design.h | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/common/design.h b/common/design.h index 1591e0f2..d05e6095 100644 --- a/common/design.h +++ b/common/design.h @@ -30,11 +30,6 @@ // replace with proper IdString later typedef std::string IdString; -// replace with haslib later -template <typename T> using pool = std::unordered_set<T>; -template <typename T, typename U> using dict = std::unordered_map<T, U>; -using std::vector; - struct GraphicElement { // This will control colour, and there should be separate @@ -82,11 +77,11 @@ struct NetInfo { IdString name; PortRef driver; - vector<PortRef> users; - dict<IdString, std::string> attrs; + std::vector<PortRef> users; + std::unordered_map<IdString, std::string> attrs; // wire -> uphill_pip - dict<WireId, PipId> wires; + std::unordered_map<WireId, PipId> wires; }; enum PortType @@ -106,12 +101,12 @@ struct PortInfo struct CellInfo { IdString name, type; - dict<IdString, PortInfo> ports; - dict<IdString, std::string> attrs, params; + std::unordered_map<IdString, PortInfo> ports; + std::unordered_map<IdString, std::string> attrs, params; BelId bel; // cell_port -> bel_pin - dict<IdString, IdString> pins; + std::unordered_map<IdString, IdString> pins; }; struct Design @@ -123,8 +118,8 @@ struct Design // ... } - dict<IdString, NetInfo *> nets; - dict<IdString, CellInfo *> cells; + std::unordered_map<IdString, NetInfo *> nets; + std::unordered_map<IdString, CellInfo *> cells; }; #endif |