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

removed extra template argument from find_conflicts to make SUN happy again.

This commit is contained in:
Nico Kruithof 2006-09-27 08:01:05 +00:00
parent 08170cc9ba
commit dd96d5559d
3 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Triangulation_3/include/CGAL/Delaunay_triangulation_3.h
View File

@ -231,7 +231,7 @@ public:
if (dimension() == 2) { if (dimension() == 2) {
Conflict_tester_2 tester(p, this); Conflict_tester_2 tester(p, this);
ifit = Tr_Base::template find_conflicts<2> ifit = Tr_Base::find_conflicts
(c, tester, (c, tester,
make_triple(std::back_inserter(facets), make_triple(std::back_inserter(facets),
std::back_inserter(cells), std::back_inserter(cells),
@ -239,7 +239,7 @@ public:
} }
else { else {
Conflict_tester_3 tester(p, this); Conflict_tester_3 tester(p, this);
ifit = Tr_Base::template find_conflicts<3> ifit = Tr_Base::find_conflicts
(c, tester, (c, tester,
make_triple(std::back_inserter(facets), make_triple(std::back_inserter(facets),
std::back_inserter(cells), std::back_inserter(cells),

4
Triangulation_3/include/CGAL/Regular_triangulation_3.h
View File

@ -164,7 +164,7 @@ public:
if (dimension() == 2) { if (dimension() == 2) {
Conflict_tester_for_find_conflicts_2 tester(p, this); Conflict_tester_for_find_conflicts_2 tester(p, this);
ifit = Tr_Base::template find_conflicts<2> ifit = Tr_Base::find_conflicts
(c, tester, (c, tester,
make_triple(std::back_inserter(facets), make_triple(std::back_inserter(facets),
std::back_inserter(cells), std::back_inserter(cells),
@ -172,7 +172,7 @@ public:
} }
else { else {
Conflict_tester_for_find_conflicts_3 tester(p, this); Conflict_tester_for_find_conflicts_3 tester(p, this);
ifit = Tr_Base::template find_conflicts<3> ifit = Tr_Base::find_conflicts
(c, tester, (c, tester,
make_triple(std::back_inserter(facets), make_triple(std::back_inserter(facets),
std::back_inserter(cells), std::back_inserter(cells),

27
Triangulation_3/include/CGAL/Triangulation_3.h
View File

@ -631,7 +631,7 @@ protected:
OutputIteratorCells, OutputIteratorCells,
OutputIteratorInternalFacets> it) const { OutputIteratorInternalFacets> it) const {
bool FIND_CONFLICTS_2_DEPRECATED_USE_FIND_CONFLICTS; bool FIND_CONFLICTS_2_DEPRECATED_USE_FIND_CONFLICTS;
return find_conflicts<2>(c,tester,it); return find_conflicts(c,tester,it);
} }
template <class Conflict_test, template <class Conflict_test,
@ -646,7 +646,7 @@ protected:
OutputIteratorCells, OutputIteratorCells,
OutputIteratorInternalFacets> it) const { OutputIteratorInternalFacets> it) const {
bool FIND_CONFLICTS_3_DEPRECATED_USE_FIND_CONFLICTS; bool FIND_CONFLICTS_3_DEPRECATED_USE_FIND_CONFLICTS;
return find_conflicts<3>(c,tester,it); return find_conflicts(c,tester,it);
} }
// - c is the current cell, which must be in conflict. // - c is the current cell, which must be in conflict.
@ -656,7 +656,7 @@ protected:
// 0 -> unknown // 0 -> unknown
// 1 -> in conflict // 1 -> in conflict
// 2 -> not in conflict (== on boundary) // 2 -> not in conflict (== on boundary)
template <int dim, template <
class Conflict_test, class Conflict_test,
class OutputIteratorBoundaryFacets, class OutputIteratorBoundaryFacets,
class OutputIteratorCells, class OutputIteratorCells,
@ -670,13 +670,12 @@ protected:
OutputIteratorInternalFacets> it) const OutputIteratorInternalFacets> it) const
{ {
CGAL_triangulation_precondition( dimension()>=2 ); CGAL_triangulation_precondition( dimension()>=2 );
CGAL_triangulation_precondition( dim == dimension() );
CGAL_triangulation_precondition( tester(c) ); CGAL_triangulation_precondition( tester(c) );
c->set_in_conflict_flag(1); c->set_in_conflict_flag(1);
*it.second++ = c; *it.second++ = c;
for (int i=0; i<dim+1; ++i) { for (int i=0; i<dimension()+1; ++i) {
Cell_handle test = c->neighbor(i); Cell_handle test = c->neighbor(i);
if (test->get_in_conflict_flag() == 1) { if (test->get_in_conflict_flag() == 1) {
if (c < test) if (c < test)
@ -687,7 +686,7 @@ protected:
if (tester(test)) { if (tester(test)) {
if (c < test) if (c < test)
*it.third++ = Facet(c, i); // Internal facet. *it.third++ = Facet(c, i); // Internal facet.
it = find_conflicts<dim>(test, tester, it); it = find_conflicts(test, tester, it);
continue; continue;
} }
test->set_in_conflict_flag(2); // test is on the boundary. test->set_in_conflict_flag(2); // test is on the boundary.
@ -715,14 +714,14 @@ protected:
// Find the cells in conflict // Find the cells in conflict
switch (dimension()) { switch (dimension()) {
case 3: case 3:
find_conflicts<3>(c, tester, make_triple(Oneset_iterator<Facet>(facet), find_conflicts(c, tester, make_triple(Oneset_iterator<Facet>(facet),
std::back_inserter(cells), std::back_inserter(cells),
Emptyset_iterator())); Emptyset_iterator()));
break; break;
case 2: case 2:
find_conflicts<2>(c, tester, make_triple(Oneset_iterator<Facet>(facet), find_conflicts(c, tester, make_triple(Oneset_iterator<Facet>(facet),
std::back_inserter(cells), std::back_inserter(cells),
Emptyset_iterator())); Emptyset_iterator()));
} }
// Create the new cells and delete the old. // Create the new cells and delete the old.
return _tds._insert_in_hole(cells.begin(), cells.end(), return _tds._insert_in_hole(cells.begin(), cells.end(),
@ -2386,7 +2385,7 @@ insert_in_conflict(const Point & p,
Facet facet; Facet facet;
cells.reserve(32); cells.reserve(32);
find_conflicts<3> find_conflicts
(c, tester, make_triple(Oneset_iterator<Facet>(facet), (c, tester, make_triple(Oneset_iterator<Facet>(facet),
std::back_inserter(cells), std::back_inserter(cells),
Emptyset_iterator())); Emptyset_iterator()));
@ -2427,7 +2426,7 @@ insert_in_conflict(const Point & p,
Facet facet; Facet facet;
cells.reserve(32); cells.reserve(32);
find_conflicts<2> find_conflicts
(c, tester, make_triple(Oneset_iterator<Facet>(facet), (c, tester, make_triple(Oneset_iterator<Facet>(facet),
std::back_inserter(cells), std::back_inserter(cells),
Emptyset_iterator())); Emptyset_iterator()));