Merge pull request #45 from YosysHQ/constids

 Get rid of PortPin and BelType

1 files changed, 3 insertions, 3 deletions

diff --git a/common/nextpnr.h b/common/nextpnr.h
index 6195329b..e588f47b 100644
--- a/common/nextpnr.h
+++ b/common/nextpnr.h
@@ -100,13 +100,13 @@ struct Context;
 
 struct IdString
 {
-    int index = 0;
+    int index;
 
     static void initialize_arch(const BaseCtx *ctx);
 
     static void initialize_add(const BaseCtx *ctx, const char *s, int idx);
 
-    IdString() {}
+    constexpr IdString(int index = 0) : index(index) {}
 
     void set(const BaseCtx *ctx, const std::string &s);
 
@@ -211,7 +211,7 @@ struct DecalXY
 struct BelPin
 {
     BelId bel;
-    PortPin pin;
+    IdString pin;
 };
 
 struct CellInfo;