songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

changed "emit" to "emapit" to avoid a clash with Qt

This commit is contained in:
Mariette Yvinec 2002-02-25 17:54:21 +00:00
parent 7de0be71e8
commit c71baed4a1
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Packages/Triangulation_2/changes.txt
View File

@ -1,6 +1,10 @@
Package triangulation: provides triangulations Delaunay triangulations,
constrained and regular triangulations with tests and examples.
Ver 6.12 (25/02/02)
- in Triangulation_data_structure_2.h chane the variible "emit" to "emapit"
to fix a clash with Qt
Ver 6.11 (19/02/02)
- added missing file in the doc

8
Packages/Triangulation_2/include/CGAL/Triangulation_data_structure_2.h
View File

@ -1720,14 +1720,14 @@ set_adjacency(Face_handle fh,
Vh_pair vhp = vhcw < vhccw ?
std::make_pair(vhcw, vhccw)
: std::make_pair(vhccw, vhcw) ;
typename std::map<Vh_pair, Edge>::iterator emit = edge_map.find(vhp);
if (emit == edge_map.end()) {// not found, insert edge
typename std::map<Vh_pair, Edge>::iterator emapit = edge_map.find(vhp);
if (emapit == edge_map.end()) {// not found, insert edge
edge_map.insert(std::make_pair(vhp, Edge(fh,ih)));
}
else { //found set adjacency and erase
Edge e = emit->second;
Edge e = emapit->second;
set_adjacency( fh,ih, e.first, e.second);
edge_map.erase(emit);
edge_map.erase(emapit);
}
}