Remove pool, dict, vector namespace aliases

Signed-off-by: Clifford Wolf <clifford@clifford.at>

2 files changed, 51 insertions, 42 deletions

diff --git a/dummy/chip.cc b/dummy/chip.cc
index 2ca02964..1376c11c 100644
--- a/dummy/chip.cc
+++ b/dummy/chip.cc
@@ -34,17 +34,20 @@ void Chip::unbindBel(BelId bel) {}
 
 bool Chip::checkBelAvail(BelId bel) const { return false; }
 
-IdString Chip::getBelCell(BelId bel, bool conflicting) const { return IdString(); }
+IdString Chip::getBelCell(BelId bel, bool conflicting) const
+{
+    return IdString();
+}
 
-const vector<BelId> &Chip::getBels() const
+const std::vector<BelId> &Chip::getBels() const
 {
-    static vector<BelId> ret;
+    static std::vector<BelId> ret;
     return ret;
 }
 
-const vector<BelId> &Chip::getBelsByType(BelType type) const
+const std::vector<BelId> &Chip::getBelsByType(BelType type) const
 {
-    static vector<BelId> ret;
+    static std::vector<BelId> ret;
     return ret;
 }
 
@@ -54,9 +57,9 @@ WireId Chip::getWireBelPin(BelId bel, PortPin pin) const { return WireId(); }
 
 BelPin Chip::getBelPinUphill(WireId wire) const { return BelPin(); }
 
-const vector<BelPin> &Chip::getBelPinsDownhill(WireId wire) const
+const std::vector<BelPin> &Chip::getBelPinsDownhill(WireId wire) const
 {
-    static vector<BelPin> ret;
+    static std::vector<BelPin> ret;
     return ret;
 }
 
@@ -72,11 +75,14 @@ void Chip::unbindWire(WireId wire) {}
 
 bool Chip::checkWireAvail(WireId wire) const { return false; }
 
-IdString Chip::getWireNet(WireId wire, bool conflicting) const { return IdString(); }
+IdString Chip::getWireNet(WireId wire, bool conflicting) const
+{
+    return IdString();
+}
 
-const vector<WireId> &Chip::getWires() const
+const std::vector<WireId> &Chip::getWires() const
 {
-    static vector<WireId> ret;
+    static std::vector<WireId> ret;
     return ret;
 }
 
@@ -92,11 +98,14 @@ void Chip::unbindPip(PipId pip) {}
 
 bool Chip::checkPipAvail(PipId pip) const { return false; }
 
-IdString Chip::getPipNet(PipId pip, bool conflicting) const { return IdString(); }
+IdString Chip::getPipNet(PipId pip, bool conflicting) const
+{
+    return IdString();
+}
 
-const vector<PipId> &Chip::getPips() const
+const std::vector<PipId> &Chip::getPips() const
 {
-    static vector<PipId> ret;
+    static std::vector<PipId> ret;
     return ret;
 }
 
@@ -106,44 +115,44 @@ WireId Chip::getPipDstWire(PipId pip) const { return WireId(); }
 
 DelayInfo Chip::getPipDelay(PipId pip) const { return DelayInfo(); }
 
-const vector<PipId> &Chip::getPipsDownhill(WireId wire) const
+const std::vector<PipId> &Chip::getPipsDownhill(WireId wire) const
 {
-    static vector<PipId> ret;
+    static std::vector<PipId> ret;
     return ret;
 }
 
-const vector<PipId> &Chip::getPipsUphill(WireId wire) const
+const std::vector<PipId> &Chip::getPipsUphill(WireId wire) const
 {
-    static vector<PipId> ret;
+    static std::vector<PipId> ret;
     return ret;
 }
 
-const vector<PipId> &Chip::getWireAliases(WireId wire) const
+const std::vector<PipId> &Chip::getWireAliases(WireId wire) const
 {
-    static vector<PipId> ret;
+    static std::vector<PipId> ret;
     return ret;
 }
 
-vector<GraphicElement> Chip::getBelGraphics(BelId bel) const
+std::vector<GraphicElement> Chip::getBelGraphics(BelId bel) const
 {
-    static vector<GraphicElement> ret;
+    static std::vector<GraphicElement> ret;
     return ret;
 }
 
-vector<GraphicElement> Chip::getWireGraphics(WireId wire) const
+std::vector<GraphicElement> Chip::getWireGraphics(WireId wire) const
 {
-    static vector<GraphicElement> ret;
+    static std::vector<GraphicElement> ret;
     return ret;
 }
 
-vector<GraphicElement> Chip::getPipGraphics(PipId pip) const
+std::vector<GraphicElement> Chip::getPipGraphics(PipId pip) const
 {
-    static vector<GraphicElement> ret;
+    static std::vector<GraphicElement> ret;
     return ret;
 }
 
-vector<GraphicElement> Chip::getFrameGraphics() const
+std::vector<GraphicElement> Chip::getFrameGraphics() const
 {
-    static vector<GraphicElement> ret;
+    static std::vector<GraphicElement> ret;
     return ret;
 }
diff --git a/dummy/chip.h b/dummy/chip.h
index 60db776e..3e98071e 100644
--- a/dummy/chip.h
+++ b/dummy/chip.h
@@ -74,44 +74,44 @@ struct Chip
     void bindBel(BelId bel, IdString cell);
     void unbindBel(BelId bel);
     bool checkBelAvail(BelId bel) const;
-    IdString getBelCell(BelId bel, bool conflicting=false) const;
-    const vector<BelId> &getBels() const;
-    const vector<BelId> &getBelsByType(BelType type) const;
+    IdString getBelCell(BelId bel, bool conflicting = false) const;
+    const std::vector<BelId> &getBels() const;
+    const std::vector<BelId> &getBelsByType(BelType type) const;
     BelType getBelType(BelId bel) const;
     WireId getWireBelPin(BelId bel, PortPin pin) const;
     BelPin getBelPinUphill(WireId wire) const;
-    const vector<BelPin> &getBelPinsDownhill(WireId wire) const;
+    const std::vector<BelPin> &getBelPinsDownhill(WireId wire) const;
 
     WireId getWireByName(IdString name) const;
     IdString getWireName(WireId wire) const;
     void bindWire(WireId wire, IdString net);
     void unbindWire(WireId wire);
     bool checkWireAvail(WireId wire) const;
-    IdString getWireNet(WireId wire, bool conflicting=false) const;
-    const vector<WireId> &getWires() const;
+    IdString getWireNet(WireId wire, bool conflicting = false) const;
+    const std::vector<WireId> &getWires() const;
 
     PipId getPipByName(IdString name) const;
     IdString getPipName(PipId pip) const;
     void bindPip(PipId pip, IdString net);
     void unbindPip(PipId pip);
     bool checkPipAvail(PipId pip) const;
-    IdString getPipNet(PipId pip, bool conflicting=false) const;
-    const vector<PipId> &getPips() const;
+    IdString getPipNet(PipId pip, bool conflicting = false) const;
+    const std::vector<PipId> &getPips() const;
     WireId getPipSrcWire(PipId pip) const;
     WireId getPipDstWire(PipId pip) const;
     DelayInfo getPipDelay(PipId pip) const;
-    const vector<PipId> &getPipsDownhill(WireId wire) const;
-    const vector<PipId> &getPipsUphill(WireId wire) const;
-    const vector<PipId> &getWireAliases(WireId wire) const;
+    const std::vector<PipId> &getPipsDownhill(WireId wire) const;
+    const std::vector<PipId> &getPipsUphill(WireId wire) const;
+    const std::vector<PipId> &getWireAliases(WireId wire) const;
 
     void getBelPosition(BelId bel, float &x, float &y) const;
     void getWirePosition(WireId wire, float &x, float &y) const;
     void getPipPosition(PipId pip, float &x, float &y) const;
 
-    vector<GraphicElement> getBelGraphics(BelId bel) const;
-    vector<GraphicElement> getWireGraphics(WireId wire) const;
-    vector<GraphicElement> getPipGraphics(PipId pip) const;
-    vector<GraphicElement> getFrameGraphics() const;
+    std::vector<GraphicElement> getBelGraphics(BelId bel) const;
+    std::vector<GraphicElement> getWireGraphics(WireId wire) const;
+    std::vector<GraphicElement> getPipGraphics(PipId pip) const;
+    std::vector<GraphicElement> getFrameGraphics() const;
 };
 
 #endif