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

Revert "Cell_attribute::get_nb_refs is public and not protected; CMap_cell_iterator copy contructor and operator= share also mark mmark_number" 

This reverts commit 9aaab1e74a.

(pushed by error in master instead of in my branch)
This commit is contained in:
Guillaume Damiand 2013-04-23 21:00:36 +02:00
parent 9aaab1e74a
commit f58aa32242
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Combinatorial_map/include/CGAL/Cell_attribute.h
View File

@ -140,11 +140,11 @@ namespace CGAL {
--mrefcounting; --mrefcounting;
} }
public:
/// Get the reference counting. /// Get the reference counting.
unsigned int get_nb_refs() const unsigned int get_nb_refs() const
{ return mrefcounting; } { return mrefcounting; }
public:
void * for_compact_container() const void * for_compact_container() const
{ return vp; } { return vp; }
void * & for_compact_container() void * & for_compact_container()

8
Combinatorial_map/include/CGAL/Cell_iterators.h
View File

@ -112,10 +112,7 @@ namespace CGAL {
CMap_cell_iterator(const Self& aiterator): CMap_cell_iterator(const Self& aiterator):
Ite(aiterator), Ite(aiterator),
mcell_mark_number(aiterator.mcell_mark_number) mcell_mark_number(aiterator.mcell_mark_number)
{ { this->mmap->share_a_mark(this->mcell_mark_number); }
this->mmap->share_a_mark(this->mmark_number);
this->mmap->share_a_mark(this->mcell_mark_number);
}
/// Assignment operator. /// Assignment operator.
Self& operator=(const Self& aiterator) Self& operator=(const Self& aiterator)
@ -123,7 +120,6 @@ namespace CGAL {
if (this != &aiterator) if (this != &aiterator)
{ {
Ite::operator=(aiterator); Ite::operator=(aiterator);
this->mmap->share_a_mark(this->mmark_number);
this->mmap->share_a_mark(mcell_mark_number); this->mmap->share_a_mark(mcell_mark_number);
} }
return *this; return *this;
@ -205,7 +201,7 @@ namespace CGAL {
mmark_number(amap.get_new_mark()) mmark_number(amap.get_new_mark())
{ {
CGAL_static_assertion( (boost::is_same<typename Ite::Basic_iterator, CGAL_static_assertion( (boost::is_same<typename Ite::Basic_iterator,
Tag_true>::value) ); Tag_true>::value) );
CGAL_assertion(amap.is_whole_map_unmarked(mmark_number)); CGAL_assertion(amap.is_whole_map_unmarked(mmark_number));
mark_cell<Map,i,dim>(amap, adart, mmark_number); mark_cell<Map,i,dim>(amap, adart, mmark_number);
} }