diff options
| author | D. Shah <dave@ds0.me> | 2021-02-08 10:29:50 +0000 |
|---|---|---|
| committer | D. Shah <dave@ds0.me> | 2021-02-08 10:29:50 +0000 |
| commit | efca63862c571e47cd449a6c5121ef07bf6de13f (patch) | |
| tree | 46d80d301f6ed0e588a7e462712341dd47fe7201 /generic/arch.h | |
| parent | 3e631fe2f415adeb0205eff866aaea74b8ef3ed8 (diff) | |
| download | nextpnr-efca63862c571e47cd449a6c5121ef07bf6de13f.tar.gz nextpnr-efca63862c571e47cd449a6c5121ef07bf6de13f.tar.bz2 nextpnr-efca63862c571e47cd449a6c5121ef07bf6de13f.zip | |
Use 'T' postfix to disambiguate LHS and RHS of using
Arches might otherwise have range types named ambigiously with the entry
in ArchRanges.
Signed-off-by: D. Shah <dave@ds0.me>
Diffstat (limited to 'generic/arch.h')
| -rw-r--r-- | generic/arch.h | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/generic/arch.h b/generic/arch.h index d153182e..09fd8e34 100644 --- a/generic/arch.h +++ b/generic/arch.h @@ -118,33 +118,33 @@ struct CellTiming struct ArchRanges { - using ArchArgsType = ArchArgs; + using ArchArgsT = ArchArgs; // Bels - using AllBelsRange = const std::vector<BelId> &; - using TileBelsRange = const std::vector<BelId> &; - using BelAttrsRange = const std::map<IdString, std::string> &; - using BelPinsRange = std::vector<IdString>; + using AllBelsRangeT = const std::vector<BelId> &; + using TileBelsRangeT = const std::vector<BelId> &; + using BelAttrsRangeT = const std::map<IdString, std::string> &; + using BelPinsRangeT = std::vector<IdString>; // Wires - using AllWiresRange = const std::vector<WireId> &; - using DownhillPipRange = const std::vector<PipId> &; - using UphillPipRange = const std::vector<PipId> &; - using WireBelPinRange = const std::vector<BelPin> &; - using WireAttrsRange = const std::map<IdString, std::string> &; + using AllWiresRangeT = const std::vector<WireId> &; + using DownhillPipRangeT = const std::vector<PipId> &; + using UphillPipRangeT = const std::vector<PipId> &; + using WireBelPinRangeT = const std::vector<BelPin> &; + using WireAttrsRangeT = const std::map<IdString, std::string> &; // Pips - using AllPipsRange = const std::vector<PipId> &; - using PipAttrsRange = const std::map<IdString, std::string> &; + using AllPipsRangeT = const std::vector<PipId> &; + using PipAttrsRangeT = const std::map<IdString, std::string> &; // Groups - using AllGroupsRange = std::vector<GroupId>; - using GroupBelsRange = const std::vector<BelId> &; - using GroupWiresRange = const std::vector<WireId> &; - using GroupPipsRange = const std::vector<PipId> &; - using GroupGroupsRange = const std::vector<GroupId> &; + using AllGroupsRangeT = std::vector<GroupId>; + using GroupBelsRangeT = const std::vector<BelId> &; + using GroupWiresRangeT = const std::vector<WireId> &; + using GroupPipsRangeT = const std::vector<PipId> &; + using GroupGroupsRangeT = const std::vector<GroupId> &; // Decals - using DecalGfxRange = const std::vector<GraphicElement> &; + using DecalGfxRangeT = const std::vector<GraphicElement> &; // Placement validity - using CellTypeRange = std::vector<IdString>; - using BelBucketRange = std::vector<BelBucketId>; - using BucketBelRange = std::vector<BelId>; + using CellTypeRangeT = std::vector<IdString>; + using BelBucketRangeT = std::vector<BelBucketId>; + using BucketBelRangeT = std::vector<BelId>; }; struct Arch : ArchAPI<ArchRanges> |