From fc7490370b3f81c4b0285fee545142aeb106979b Mon Sep 17 00:00:00 2001 From: David Shah Date: Mon, 18 Jun 2018 11:43:59 +0200 Subject: Improving code style and fixing dummy Signed-off-by: David Shah --- ice40/cells.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ice40') diff --git a/ice40/cells.cc b/ice40/cells.cc index b11a2a77..fb264051 100644 --- a/ice40/cells.cc +++ b/ice40/cells.cc @@ -147,7 +147,8 @@ void dff_to_lc(CellInfo *dff, CellInfo *lc, bool pass_thru_lut) if (citer != config.end()) { if ((config.end() - citer) >= 2) { - assert(*(citer++) == 'S'); + char c = *(citer++); + assert(c == 'S'); lc->params["ASYNC_SR"] = "0"; } else { lc->params["ASYNC_SR"] = "1"; -- cgit v1.2.3 From ef2d0d2cb9e149839b1cba746624becae4d7c5df Mon Sep 17 00:00:00 2001 From: David Shah Date: Mon, 18 Jun 2018 12:20:06 +0200 Subject: Fix hash specialisation for BelType and warnings in place_sa.cc Signed-off-by: David Shah --- ice40/chip.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'ice40') diff --git a/ice40/chip.h b/ice40/chip.h index 9d647756..d3eb7c70 100644 --- a/ice40/chip.h +++ b/ice40/chip.h @@ -743,4 +743,15 @@ struct Chip NEXTPNR_NAMESPACE_END +namespace std { +template <> struct hash +{ + std::size_t operator()(NEXTPNR_NAMESPACE_PREFIX BelType bt) const + noexcept + { + return std::hash()(int(bt)); + } +}; +} // namespace std + #endif -- cgit v1.2.3