From d4f37d30dd6af52ffdfbdd76aac4d6e98dfba5b6 Mon Sep 17 00:00:00 2001 From: Roselyne Chotin-Avot Date: Thu, 3 Aug 2017 10:22:17 +0200 Subject: [PATCH] In katana Change return type of getAxisWeight from long to DbU::Unit --- katana/src/katana/RoutingEvent.h | 4 ++-- katana/src/katana/TrackCost.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/katana/src/katana/RoutingEvent.h b/katana/src/katana/RoutingEvent.h index 2367bca9..b79f39d9 100644 --- a/katana/src/katana/RoutingEvent.h +++ b/katana/src/katana/RoutingEvent.h @@ -124,7 +124,7 @@ namespace Katana { inline const vector& getPerpandiculars () const; inline DbU::Unit getAxisHint () const; inline DbU::Unit getAxisHistory () const; - inline long getAxisWeight ( DbU::Unit ) const; + inline DbU::Unit getAxisWeight ( DbU::Unit ) const; inline const Interval& getConstraints () const; inline const Interval& getOptimal () const; inline const Interval& getPerpandicularFree () const; @@ -218,7 +218,7 @@ namespace Katana { //inline const vector& RoutingEvent::getPerpandiculars () const { return _perpandiculars; } inline DbU::Unit RoutingEvent::getAxisHistory () const { return _axisHistory; } inline DbU::Unit RoutingEvent::getAxisHint () const { return _axisHint; } - inline long RoutingEvent::getAxisWeight ( DbU::Unit axis ) const { return abs(axis - getAxisHint()); } + inline DbU::Unit RoutingEvent::getAxisWeight ( DbU::Unit axis ) const { return abs(axis - getAxisHint()); } inline const Interval& RoutingEvent::getConstraints () const { return _constraints; } inline const Interval& RoutingEvent::getOptimal () const { return _optimal; } inline const Interval& RoutingEvent::getPerpandicularFree () const { return _dataNegociate->getPerpandicularFree(); } diff --git a/katana/src/katana/TrackCost.h b/katana/src/katana/TrackCost.h index 95d95336..32245001 100644 --- a/katana/src/katana/TrackCost.h +++ b/katana/src/katana/TrackCost.h @@ -119,7 +119,7 @@ namespace Katana { inline DbU::Unit getDelta () const; inline DbU::Unit getDeltaPerpand () const; inline DbU::Unit getLongestOverlap () const; - inline long getAxisWeight () const; + inline DbU::Unit getAxisWeight () const; inline int getRipupCount () const; inline uint32_t getDataState () const; inline uint32_t setFlags ( uint32_t ); @@ -203,7 +203,7 @@ namespace Katana { inline uint32_t TrackCost::getTerminals () const { return _terminals; } inline DbU::Unit TrackCost::getLongestOverlap () const { return _longuestOverlap; } inline DbU::Unit TrackCost::getDelta () const { return _delta; } - inline long TrackCost::getAxisWeight () const { return _axisWeight; } + inline DbU::Unit TrackCost::getAxisWeight () const { return _axisWeight; } inline int TrackCost::getRipupCount () const { return _ripupCount; } inline uint32_t TrackCost::getDataState () const { return _dataState; } inline uint32_t TrackCost::setFlags ( uint32_t mask ) { _flags |= mask; return _flags; }