diff options
Diffstat (limited to 'gowin')
-rw-r--r-- | gowin/arch.h | 19 | ||||
-rw-r--r-- | gowin/archdefs.h | 10 |
2 files changed, 22 insertions, 7 deletions
diff --git a/gowin/arch.h b/gowin/arch.h index e0686d1c..0f975f77 100644 --- a/gowin/arch.h +++ b/gowin/arch.h @@ -18,9 +18,18 @@ * */ -#ifndef NEXTPNR_H -#error Include "arch.h" via "nextpnr.h" only. -#endif +#ifndef GOWIN_ARCH_H +#define GOWIN_ARCH_H + +#include <cstdint> +#include <map> +#include <string> +#include <vector> + +#include "base_arch.h" +#include "idstring.h" +#include "nextpnr_namespaces.h" +#include "nextpnr_types.h" NEXTPNR_NAMESPACE_BEGIN @@ -40,7 +49,7 @@ template <typename T> struct RelPtr return const_cast<T *>(reinterpret_cast<const T *>(reinterpret_cast<const char *>(this) + offset)); } - const T &operator[](size_t index) const { return get()[index]; } + const T &operator[](std::size_t index) const { return get()[index]; } const T &operator*() const { return *(get()); } @@ -453,3 +462,5 @@ struct Arch : BaseArch<ArchRanges> }; NEXTPNR_NAMESPACE_END + +#endif /* GOWIN_ARCH_H */ diff --git a/gowin/archdefs.h b/gowin/archdefs.h index 963660c6..ef297d41 100644 --- a/gowin/archdefs.h +++ b/gowin/archdefs.h @@ -18,9 +18,11 @@ * */ -#ifndef NEXTPNR_H -#error Include "archdefs.h" via "nextpnr.h" only. -#endif +#ifndef GOWIN_ARCHDEFS_H +#define GOWIN_ARCHDEFS_H + +#include "idstring.h" +#include "nextpnr_namespaces.h" NEXTPNR_NAMESPACE_BEGIN @@ -68,3 +70,5 @@ struct ArchCellInfo }; NEXTPNR_NAMESPACE_END + +#endif /* GOWIN_ARCHDEFS_H */ |