From c71baed4a1590b97e2caa67c4feff3556bf858fd Mon Sep 17 00:00:00 2001 From: Mariette Yvinec Date: Mon, 25 Feb 2002 17:54:21 +0000 Subject: [PATCH] changed "emit" to "emapit" to avoid a clash with Qt --- Packages/Triangulation_2/changes.txt | 4 ++++ .../include/CGAL/Triangulation_data_structure_2.h | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Packages/Triangulation_2/changes.txt b/Packages/Triangulation_2/changes.txt index e4659239325..db5109080d7 100644 --- a/Packages/Triangulation_2/changes.txt +++ b/Packages/Triangulation_2/changes.txt @@ -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 diff --git a/Packages/Triangulation_2/include/CGAL/Triangulation_data_structure_2.h b/Packages/Triangulation_2/include/CGAL/Triangulation_data_structure_2.h index 0befbf8f7d6..586df0d36bb 100644 --- a/Packages/Triangulation_2/include/CGAL/Triangulation_data_structure_2.h +++ b/Packages/Triangulation_2/include/CGAL/Triangulation_data_structure_2.h @@ -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::iterator emit = edge_map.find(vhp); - if (emit == edge_map.end()) {// not found, insert edge + typename std::map::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); } }