From 4134bfa78e9d56593ee306e482f778e5fc04f3d0 Mon Sep 17 00:00:00 2001 From: Eddie Hung Date: Tue, 13 Nov 2018 12:12:26 -0800 Subject: [timing] Resolve another merge conflict --- common/place_common.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'common') diff --git a/common/place_common.cc b/common/place_common.cc index 1c262c6f..04e9b7d0 100644 --- a/common/place_common.cc +++ b/common/place_common.cc @@ -36,8 +36,8 @@ wirelen_t get_net_metric(const Context *ctx, const NetInfo *net, MetricType type bool driver_gb = ctx->getBelGlobalBuf(driver_cell->bel); if (driver_gb) return 0; - IdString clock_port; - bool timing_driven = ctx->timing_driven && type == MetricType::COST && ctx->getPortTimingClass(driver_cell, net->driver.port, clock_port) != TMG_IGNORE; + int clock_count; + bool timing_driven = ctx->timing_driven && type == MetricType::COST && ctx->getPortTimingClass(driver_cell, net->driver.port, clock_count) != TMG_IGNORE; delay_t negative_slack = 0; delay_t worst_slack = std::numeric_limits::max(); Loc driver_loc = ctx->getBelLocation(driver_cell->bel); -- cgit v1.2.3