From ca2e328a5fa7c538c5dad843558c66822bc4d5af Mon Sep 17 00:00:00 2001 From: Nathaniel Quillin <1446767+nqbit@users.noreply.github.com> Date: Tue, 16 May 2023 03:38:02 +0000 Subject: [PATCH] rename c++20 keyword s/requires/requires_range. See https://en.cppreference.com/w/cpp/language/requires for more details. --- common/kernel/constraints.impl.h | 2 +- common/kernel/exclusive_state_groups.h | 2 +- common/kernel/exclusive_state_groups.impl.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/kernel/constraints.impl.h b/common/kernel/constraints.impl.h index 9c978411e1..145aff5be4 100644 --- a/common/kernel/constraints.impl.h +++ b/common/kernel/constraints.impl.h @@ -92,7 +92,7 @@ bool Constraints::isValidBelForCellType(const } break; case CONSTRAINT_TAG_REQUIRES: - if (!tags[constraint.tag()].requires(constraint.states())) { + if (!tags[constraint.tag()].requires_range(constraint.states())) { return false; } break; diff --git a/common/kernel/exclusive_state_groups.h b/common/kernel/exclusive_state_groups.h index 7d447ffe1d..b99876bad1 100644 --- a/common/kernel/exclusive_state_groups.h +++ b/common/kernel/exclusive_state_groups.h @@ -127,7 +127,7 @@ template bool - requires(const StateRange &state_range) + requires_range(const StateRange &state_range) const { if (state < 0) { diff --git a/common/kernel/exclusive_state_groups.impl.h b/common/kernel/exclusive_state_groups.impl.h index f3ddb5fd38..6934a02871 100644 --- a/common/kernel/exclusive_state_groups.impl.h +++ b/common/kernel/exclusive_state_groups.impl.h @@ -70,7 +70,7 @@ void ExclusiveStateGroup::explain_requires(con const Definition &definition, BelId bel, const StateRange state_range) const { - if (requires(state_range)) { + if (requires_range(state_range)) { log_info("Placing cell %s at bel %s does not violate %s.%s\n", cell.c_str(ctx), ctx->nameOfBel(bel), object.c_str(ctx), definition.prefix.c_str(ctx)); } else {