jcarr
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare function key adjustement for Rule in Technology.h 

* Bug: In hurricane/Technology.h we define a set of UnitRule with a
    custom sorting function. STL starting with gcc 8, introduce a type
    checking of the compare function. And as everithon is template, we
    must use the exact key type and no longer a base type... So we create
    an overload for each derived type :-(
This commit is contained in:
Jean-Paul Chaput 2019-03-04 12:45:02 +01:00
parent 915eaf2157
commit fac01b10aa
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hurricane/src/hurricane/hurricane/Technology.h
View File

@ -44,6 +44,9 @@
#include "hurricane/DeviceDescriptor.h"
#include "hurricane/ModelDescriptor.h"
#include "hurricane/Rule.h"
#include "hurricane/UnitRule.h"
#include "hurricane/PhysicalRule.h"
#include "hurricane/TwoLayersPhysicalRule.h"
namespace Hurricane {
@ -55,9 +58,6 @@ namespace Hurricane {
class BasicLayer;
class RegularLayer;
class ViaLayer;
class UnitRule;
class PhysicalRule;
class TwoLayersPhysicalRule;
// -------------------------------------------------------------------
@ -71,9 +71,12 @@ namespace Hurricane {
typedef set<DeviceDescriptor*, DeviceDescriptor::DeviceDescriptorComp> DeviceDescriptors;
typedef set<ModelDescriptor* , ModelDescriptor::ModelDescriptorComp> ModelDescriptors;
public:
struct RuleNameCompare:
public std::binary_function<const Rule*, const Rule*, bool> {
bool operator() ( const Rule* rule1, const Rule* rule2 ) const
struct RuleNameCompare {
inline bool operator() ( const PhysicalRule* rule1 , const PhysicalRule* rule2 ) const
{ return rule1->getName() < rule2->getName(); }
inline bool operator() ( const UnitRule* rule1 , const UnitRule* rule2 ) const
{ return rule1->getName() < rule2->getName(); }
inline bool operator() ( const Rule* rule1 , const Rule* rule2 ) const
{ return rule1->getName() < rule2->getName(); }
};
public: