From 8aaa904724a997757bd790bd0863dee1678d8842 Mon Sep 17 00:00:00 2001 From: The Coriolis Project Date: Thu, 11 Mar 2010 16:00:58 +0000 Subject: [PATCH] * All tools: - Change: Adaptation to cmake 2.8. No more "add_subdirectory()" when the sub directory doesn't hold a CMakeList.txt. For "add_definition()", set policy 00005 to NEW. - Change: Integrate IO extenal libraries. - Change: Small compatibilities between "size_t" and "unsigned int" under 64 bits. - Change: Temporarily disable Equinox/Solstice in unicorn. --- katabatic/src/AutoContact.cpp | 4 ++-- katabatic/src/GCell.cpp | 4 ++-- katabatic/src/katabatic/GCell.h | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/katabatic/src/AutoContact.cpp b/katabatic/src/AutoContact.cpp index 94bd4e5e..e20c8cb6 100644 --- a/katabatic/src/AutoContact.cpp +++ b/katabatic/src/AutoContact.cpp @@ -2237,7 +2237,7 @@ namespace Katabatic { unsigned int AutoContact::getMinDepth () const { - unsigned int minDepth = (unsigned int)-1; + size_t minDepth = (size_t)-1; Component* anchor = getAnchor (); if ( anchor ) { minDepth = min ( minDepth, Session::getRoutingGauge()->getLayerDepth(anchor->getLayer()) ); @@ -2249,7 +2249,7 @@ namespace Katabatic { //ltrace(200) << "Slave:" << *icomponent << endl; } - return minDepth; + return (unsigned int)minDepth; } diff --git a/katabatic/src/GCell.cpp b/katabatic/src/GCell.cpp index e9f2dc8c..c974afed 100644 --- a/katabatic/src/GCell.cpp +++ b/katabatic/src/GCell.cpp @@ -62,7 +62,7 @@ namespace Katabatic { // Class : "Katabatic::GCell::CompareByDensity". - GCell::CompareByDensity::CompareByDensity ( unsigned int depth ) + GCell::CompareByDensity::CompareByDensity ( size_t depth ) : _depth(depth) { } @@ -166,7 +166,7 @@ namespace Katabatic { } - bool GCell::isSaturated ( unsigned int depth ) const + bool GCell::isSaturated ( size_t depth ) const { return getDensity(depth) > Session::getSaturateRatio(); } diff --git a/katabatic/src/katabatic/GCell.h b/katabatic/src/katabatic/GCell.h index d6ea6c31..d87012e8 100644 --- a/katabatic/src/katabatic/GCell.h +++ b/katabatic/src/katabatic/GCell.h @@ -74,10 +74,10 @@ namespace Katabatic { public: class CompareByDensity : public binary_function { public: - CompareByDensity ( unsigned int depth ); + CompareByDensity ( size_t depth ); bool operator() ( GCell* lhs, GCell* rhs ); private: - unsigned int _depth; + size_t _depth; }; public: @@ -90,7 +90,7 @@ namespace Katabatic { virtual const Name& getName () const; // Accessors. inline bool isSaturated () const; - bool isSaturated ( unsigned int depth ) const; + bool isSaturated ( size_t depth ) const; inline bool isValid () const; bool isAboveDensity ( float threshold ) const; bool hasFreeTrack ( size_t depth ) const; @@ -115,7 +115,7 @@ namespace Katabatic { float getHCapacity () const; float getVCapacity () const; inline float getCDensity ( bool update=true ) const; - inline float getDensity ( unsigned int depth, bool update=true ) const; + inline float getDensity ( size_t depth, bool update=true ) const; float getDensity ( bool update=true ) const; float getMaxHVDensity ( bool update=true ) const; float getStiffness () const; @@ -225,7 +225,7 @@ namespace Katabatic { inline float GCell::getCDensity ( bool update ) const { if (_invalid and update) const_cast(this)->updateDensity(); return _cDensity; } - inline float GCell::getDensity ( unsigned int depth, bool update ) const + inline float GCell::getDensity ( size_t depth, bool update ) const { if (_invalid and update) const_cast(this)->updateDensity(); return _densities[depth]; } inline void GCell::addVSegment ( AutoSegment* segment )