cyclonev: Rebase update

Signed-off-by: gatecat <gatecat@ds0.me>
This commit is contained in:
gatecat 2021-05-08 10:49:42 +01:00
parent 9eb0bc482e
commit 2938682295

View File

@ -22,6 +22,7 @@
#include <boost/functional/hash.hpp> #include <boost/functional/hash.hpp>
#include "base_clusterinfo.h"
#include "cyclonev.h" #include "cyclonev.h"
#include "idstring.h" #include "idstring.h"
@ -119,6 +120,7 @@ struct PipId
typedef IdString DecalId; typedef IdString DecalId;
typedef IdString GroupId; typedef IdString GroupId;
typedef IdString BelBucketId; typedef IdString BelBucketId;
typedef IdString ClusterId;
struct ArchNetInfo struct ArchNetInfo
{ {
@ -165,7 +167,7 @@ struct FFControlSet
bool operator!=(const FFControlSet &other) const { return !(*this == other); } bool operator!=(const FFControlSet &other) const { return !(*this == other); }
}; };
struct ArchCellInfo struct ArchCellInfo : BaseClusterInfo
{ {
union union
{ {