diff --git a/hurricane/src/hurricane/hurricane/IntervalTree.h b/hurricane/src/hurricane/hurricane/IntervalTree.h index d104d117..58f4264d 100644 --- a/hurricane/src/hurricane/hurricane/IntervalTree.h +++ b/hurricane/src/hurricane/hurricane/IntervalTree.h @@ -99,12 +99,12 @@ namespace Hurricane { childsVMax_ = std::max( getVMax(), std::max( lvmax, rvmax ) ); return childsVMax_; } - template< typename Data > inline bool IntervalData::operator== ( const IntervalData& other ) const { return Interval::operator==(*this) and (data_ == other.data_); } + template< typename Data > std::string IntervalData::_getString () const { diff --git a/hurricane/src/hurricane/hurricane/Net.h b/hurricane/src/hurricane/hurricane/Net.h index a239352f..5f598133 100644 --- a/hurricane/src/hurricane/hurricane/Net.h +++ b/hurricane/src/hurricane/hurricane/Net.h @@ -17,9 +17,7 @@ // not, see . // **************************************************************************************************** -#ifndef HURRICANE_NET -#define HURRICANE_NET - +#pragma once #include #include "hurricane/Entity.h" #include "hurricane/Nets.h" @@ -445,9 +443,10 @@ namespace Hurricane { // Because sometimes it didn't happens (?). const SlotTemplate dummyNetSlot ( string("dummyNetSlot"), NULL ); -} -#endif // HURRICANE_NET + typedef std::set NetSet; + +} // ****************************************************************************************************