luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MERGE: strmxor could not identify layers when one has a name and the other does not (but both have numbers)

This commit is contained in:
Matthias Koefferlein 2020-03-29 22:14:07 +02:00
parent 8796b65ddb
commit fd0b07f0cd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/buddies/src/bd/strmxor.cc
View File

@ -140,7 +140,7 @@ struct XORData
double tile_size; double tile_size;
db::Layout *output_layout; db::Layout *output_layout;
db::cell_index_type output_cell; db::cell_index_type output_cell;
std::map<db::LayerProperties, std::pair<int, int> > l2l_map; std::map<db::LayerProperties, std::pair<int, int>, db::LPLogicalLessFunc> l2l_map;
std::map<std::pair<int, db::LayerProperties>, ResultDescriptor> *results; std::map<std::pair<int, db::LayerProperties>, ResultDescriptor> *results;
}; };
@ -299,7 +299,7 @@ BD_PUBLIC int strmxor (int argc, char *argv[])
throw tl::Exception ("'" + top_b + "' is not a valid cell name in second layout"); throw tl::Exception ("'" + top_b + "' is not a valid cell name in second layout");
} }
std::map<db::LayerProperties, std::pair<int, int> > l2l_map; std::map<db::LayerProperties, std::pair<int, int>, db::LPLogicalLessFunc> l2l_map;
for (db::Layout::layer_iterator l = layout_a.begin_layers (); l != layout_a.end_layers (); ++l) { for (db::Layout::layer_iterator l = layout_a.begin_layers (); l != layout_a.end_layers (); ++l) {
l2l_map.insert (std::make_pair (*(*l).second, std::make_pair (-1, -1))).first->second.first = (*l).first; l2l_map.insert (std::make_pair (*(*l).second, std::make_pair (-1, -1))).first->second.first = (*l).first;