* 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.
This commit is contained in:
The Coriolis Project 2010-03-11 16:00:58 +00:00
parent 5206920063
commit 8aaa904724
3 changed files with 9 additions and 9 deletions

View File

@ -2237,7 +2237,7 @@ namespace Katabatic {
unsigned int AutoContact::getMinDepth () const unsigned int AutoContact::getMinDepth () const
{ {
unsigned int minDepth = (unsigned int)-1; size_t minDepth = (size_t)-1;
Component* anchor = getAnchor (); Component* anchor = getAnchor ();
if ( anchor ) { if ( anchor ) {
minDepth = min ( minDepth, Session::getRoutingGauge()->getLayerDepth(anchor->getLayer()) ); minDepth = min ( minDepth, Session::getRoutingGauge()->getLayerDepth(anchor->getLayer()) );
@ -2249,7 +2249,7 @@ namespace Katabatic {
//ltrace(200) << "Slave:" << *icomponent << endl; //ltrace(200) << "Slave:" << *icomponent << endl;
} }
return minDepth; return (unsigned int)minDepth;
} }

View File

@ -62,7 +62,7 @@ namespace Katabatic {
// Class : "Katabatic::GCell::CompareByDensity". // Class : "Katabatic::GCell::CompareByDensity".
GCell::CompareByDensity::CompareByDensity ( unsigned int depth ) GCell::CompareByDensity::CompareByDensity ( size_t depth )
: _depth(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(); } { return getDensity(depth) > Session::getSaturateRatio(); }

View File

@ -74,10 +74,10 @@ namespace Katabatic {
public: public:
class CompareByDensity : public binary_function<GCell*,GCell*,bool> { class CompareByDensity : public binary_function<GCell*,GCell*,bool> {
public: public:
CompareByDensity ( unsigned int depth ); CompareByDensity ( size_t depth );
bool operator() ( GCell* lhs, GCell* rhs ); bool operator() ( GCell* lhs, GCell* rhs );
private: private:
unsigned int _depth; size_t _depth;
}; };
public: public:
@ -90,7 +90,7 @@ namespace Katabatic {
virtual const Name& getName () const; virtual const Name& getName () const;
// Accessors. // Accessors.
inline bool isSaturated () const; inline bool isSaturated () const;
bool isSaturated ( unsigned int depth ) const; bool isSaturated ( size_t depth ) const;
inline bool isValid () const; inline bool isValid () const;
bool isAboveDensity ( float threshold ) const; bool isAboveDensity ( float threshold ) const;
bool hasFreeTrack ( size_t depth ) const; bool hasFreeTrack ( size_t depth ) const;
@ -115,7 +115,7 @@ namespace Katabatic {
float getHCapacity () const; float getHCapacity () const;
float getVCapacity () const; float getVCapacity () const;
inline float getCDensity ( bool update=true ) 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 getDensity ( bool update=true ) const;
float getMaxHVDensity ( bool update=true ) const; float getMaxHVDensity ( bool update=true ) const;
float getStiffness () const; float getStiffness () const;
@ -225,7 +225,7 @@ namespace Katabatic {
inline float GCell::getCDensity ( bool update ) const inline float GCell::getCDensity ( bool update ) const
{ if (_invalid and update) const_cast<GCell*>(this)->updateDensity(); return _cDensity; } { if (_invalid and update) const_cast<GCell*>(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<GCell*>(this)->updateDensity(); return _densities[depth]; } { if (_invalid and update) const_cast<GCell*>(this)->updateDensity(); return _densities[depth]; }
inline void GCell::addVSegment ( AutoSegment* segment ) inline void GCell::addVSegment ( AutoSegment* segment )