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

restore old code

This commit is contained in:
Guillaume Damiand 2022-04-14 13:42:44 +02:00
parent a6da7bef70
commit 409ba827ef
2 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Combinatorial_map/include/CGAL/Combinatorial_map/internal/Combinatorial_map_utility.h
View File

@ -432,19 +432,6 @@ namespace CGAL
typedef typename CMap::template Container_for_attributes<T> type; typedef typename CMap::template Container_for_attributes<T> type;
}; };
template<typename T, typename WithIndex=typename CMap::Use_index>
struct GetIndexOrHandle
{ typedef typename T::iterator type; };
template<typename T>
struct GetIndexOrHandle<T, Tag_true>
{ typedef typename T::Index type; };
template<typename T, typename WithIndex=typename CMap::Use_index>
struct GetConstIndexOrConstHandle
{ typedef typename T::const_iterator type; };
template<typename T>
struct GetConstIndexOrConstHandle<T, Tag_true>
{ typedef typename T::Index type; };
// defines as type Compact_container<T>::iterator // defines as type Compact_container<T>::iterator
template <class T> template <class T>
struct Add_compact_container_iterator{ struct Add_compact_container_iterator{
@ -453,13 +440,10 @@ namespace CGAL
typedef typename CMap::template Container_for_attributes<T>::iterator typedef typename CMap::template Container_for_attributes<T>::iterator
iterator_type; iterator_type;
// TODO case when there is no Use_index typedef in CMap // TODO? case when there is no Use_index typedef in CMap
typedef typename boost::mpl::if_ typedef typename boost::mpl::if_
< typename boost::is_same<typename CMap::Use_index,Tag_true>::type, < typename boost::is_same<typename CMap::Use_index,Tag_true>::type,
typename CMap::Dart_handle, iterator_type >::type type; typename CMap::Dart_handle, iterator_type >::type type;
/*typedef typename GetIndexOrHandle
<typename CMap::template Container_for_attributes<T> >::type type;*/
}; };
// defines as type Compact_container<T>::const_iterator // defines as type Compact_container<T>::const_iterator
@ -473,8 +457,6 @@ namespace CGAL
typedef typename boost::mpl::if_ typedef typename boost::mpl::if_
< typename boost::is_same<typename CMap::Use_index,Tag_true>::type, < typename boost::is_same<typename CMap::Use_index,Tag_true>::type,
typename CMap::Dart_const_handle, iterator_type >::type type; typename CMap::Dart_const_handle, iterator_type >::type type;
/*typedef typename GetConstIndexOrConstHandle
<typename CMap::template Container_for_attributes<T> >::type type;*/
}; };
// All the attributes (with CGAL::Void) // All the attributes (with CGAL::Void)

13
Combinatorial_map/include/CGAL/Combinatorial_map_iterators_base.h
View File

@ -66,19 +66,18 @@ namespace CGAL {
class CMap_dart_iterator; class CMap_dart_iterator;
template < typename Map_,bool Const> template < typename Map_,bool Const>
class CMap_dart_iterator<Map_, Const, Tag_false>: class CMap_dart_iterator<Map_, Const, Tag_false>: public boost::mpl::if_c< Const,
/*public boost::mpl::if_c< Const,
typename Map_::Dart_container::const_iterator, typename Map_::Dart_container::const_iterator,
typename Map_::Dart_container::iterator>::type*/ typename Map_::Dart_container::iterator>::type
public internal::CC_iterator<typename Map_::Dart_container,Const> //public internal::CC_iterator<typename Map_::Dart_container,Const>
{ {
public: public:
typedef CMap_dart_iterator<Map_,Const> Self; typedef CMap_dart_iterator<Map_,Const> Self;
/*typedef typename boost::mpl::if_c< Const, typedef typename boost::mpl::if_c< Const,
typename Map_::Dart_container::const_iterator, typename Map_::Dart_container::const_iterator,
typename Map_::Dart_container::iterator>::type Base;*/ typename Map_::Dart_container::iterator>::type Base;
typedef internal::CC_iterator<typename Map_::Dart_container,Const> Base; // typedef internal::CC_iterator<typename Map_::Dart_container,Const> Base;
typedef typename boost::mpl::if_c< Const, typedef typename boost::mpl::if_c< Const,
typename Map_::Dart_const_handle, typename Map_::Dart_const_handle,