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

Solve conflict with myself. 

Conflicts:
	Combinatorial_map/include/CGAL/Combinatorial_map_operations.h
This commit is contained in:
Guillaume Damiand 2013-01-28 13:48:50 +01:00
parent ba0e0858ea 5b36822e76
commit e7049ef7e6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Combinatorial_map/include/CGAL/internal/Combinatorial_map_functors.h
View File

@ -517,10 +517,12 @@ namespace CGAL {
std::deque<std::deque<typename Map::Dart_handle> > std::deque<std::deque<typename Map::Dart_handle> >
*store ) *store )
{ {
if ( i==j ) return;
const int mark_for_jcells = mark_for_incident_cells const int mark_for_jcells = mark_for_incident_cells
[Map::Helper::template Dimension_index<j>::value]; [Map::Helper::template Dimension_index<j>::value];
amap->negate_mark( mark_for_jcells );
if ( i==j ) return;
std::deque<std::deque<typename Map::Dart_handle> >& jcells = std::deque<std::deque<typename Map::Dart_handle> >& jcells =
store[Map::Helper::template Dimension_index<j>::value]; store[Map::Helper::template Dimension_index<j>::value];
@ -533,8 +535,6 @@ namespace CGAL {
typename Map::Helper::template Attribute_handle<j>::type typename Map::Helper::template Attribute_handle<j>::type
a2=NULL; a2=NULL;
amap->negate_mark( mark_for_jcells );
for ( typename std::deque<std::deque<typename Map::Dart_handle> >:: for ( typename std::deque<std::deque<typename Map::Dart_handle> >::
iterator it=jcells.begin(); it!=jcells.end(); ++it ) iterator it=jcells.begin(); it!=jcells.end(); ++it )
{ {
@ -558,7 +558,7 @@ namespace CGAL {
else else
{ {
a1=(*itj)->template attribute<j>(); a1=(*itj)->template attribute<j>();
a1->set_dart(*itj); // TODO a1->set_dart(*itj);
} }
for ( CMap_dart_iterator_basic_of_cell<Map,j> for ( CMap_dart_iterator_basic_of_cell<Map,j>