From ac6748238015cca1a107d99bf0f175c45eda7b2f Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Mon, 11 Jun 2018 19:56:33 +0200 Subject: Remove pool, dict, vector namespace aliases Signed-off-by: Clifford Wolf --- dummy/chip.cc | 63 ++++++++++++++++++++++++++++++++++------------------------- dummy/chip.h | 30 ++++++++++++++-------------- 2 files changed, 51 insertions(+), 42 deletions(-) (limited to 'dummy') 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 &Chip::getBels() const +const std::vector &Chip::getBels() const { - static vector ret; + static std::vector ret; return ret; } -const vector &Chip::getBelsByType(BelType type) const +const std::vector &Chip::getBelsByType(BelType type) const { - static vector ret; + static std::vector 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 &Chip::getBelPinsDownhill(WireId wire) const +const std::vector &Chip::getBelPinsDownhill(WireId wire) const { - static vector ret; + static std::vector 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 &Chip::getWires() const +const std::vector &Chip::getWires() const { - static vector ret; + static std::vector 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 &Chip::getPips() const +const std::vector &Chip::getPips() const { - static vector ret; + static std::vector 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 &Chip::getPipsDownhill(WireId wire) const +const std::vector &Chip::getPipsDownhill(WireId wire) const { - static vector ret; + static std::vector ret; return ret; } -const vector &Chip::getPipsUphill(WireId wire) const +const std::vector &Chip::getPipsUphill(WireId wire) const { - static vector ret; + static std::vector ret; return ret; } -const vector &Chip::getWireAliases(WireId wire) const +const std::vector &Chip::getWireAliases(WireId wire) const { - static vector ret; + static std::vector ret; return ret; } -vector Chip::getBelGraphics(BelId bel) const +std::vector Chip::getBelGraphics(BelId bel) const { - static vector ret; + static std::vector ret; return ret; } -vector Chip::getWireGraphics(WireId wire) const +std::vector Chip::getWireGraphics(WireId wire) const { - static vector ret; + static std::vector ret; return ret; } -vector Chip::getPipGraphics(PipId pip) const +std::vector Chip::getPipGraphics(PipId pip) const { - static vector ret; + static std::vector ret; return ret; } -vector Chip::getFrameGraphics() const +std::vector Chip::getFrameGraphics() const { - static vector ret; + static std::vector 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 &getBels() const; - const vector &getBelsByType(BelType type) const; + IdString getBelCell(BelId bel, bool conflicting = false) const; + const std::vector &getBels() const; + const std::vector &getBelsByType(BelType type) const; BelType getBelType(BelId bel) const; WireId getWireBelPin(BelId bel, PortPin pin) const; BelPin getBelPinUphill(WireId wire) const; - const vector &getBelPinsDownhill(WireId wire) const; + const std::vector &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 &getWires() const; + IdString getWireNet(WireId wire, bool conflicting = false) const; + const std::vector &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 &getPips() const; + IdString getPipNet(PipId pip, bool conflicting = false) const; + const std::vector &getPips() const; WireId getPipSrcWire(PipId pip) const; WireId getPipDstWire(PipId pip) const; DelayInfo getPipDelay(PipId pip) const; - const vector &getPipsDownhill(WireId wire) const; - const vector &getPipsUphill(WireId wire) const; - const vector &getWireAliases(WireId wire) const; + const std::vector &getPipsDownhill(WireId wire) const; + const std::vector &getPipsUphill(WireId wire) const; + const std::vector &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 getBelGraphics(BelId bel) const; - vector getWireGraphics(WireId wire) const; - vector getPipGraphics(PipId pip) const; - vector getFrameGraphics() const; + std::vector getBelGraphics(BelId bel) const; + std::vector getWireGraphics(WireId wire) const; + std::vector getPipGraphics(PipId pip) const; + std::vector getFrameGraphics() const; }; #endif -- cgit v1.2.3