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

remove custom type selection code and instead use boost::conditional

This commit is contained in:
iyaz 2013-08-30 17:45:01 +03:00 committed by Sébastien Loriot
parent 4263a7bf3a
commit a199bb6f33
1 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Operations_on_polyhedra/include/CGAL/Self_intersection_polyhedron_3.h
View File

@ -34,6 +34,7 @@
#include <boost/function_output_iterator.hpp>
#include <boost/type_traits/is_const.hpp>
#include <boost/type_traits/conditional.hpp>
namespace CGAL {
namespace internal {
@ -163,30 +164,6 @@ struct Throw_at_output {
}
};
template<class Polyhedron>
class Facet_handle_types
{
template<class Polyhedron, bool const_tag>
struct Get_;
template<class Polyhedron>
struct Get_<Polyhedron, true> {
typedef typename Polyhedron::Facet_const_iterator Facet_iterator;
typedef typename Polyhedron::Facet_const_handle Facet_handle;
};
template<class Polyhedron>
struct Get_<Polyhedron, false> {
typedef typename Polyhedron::Facet_iterator Facet_iterator;
typedef typename Polyhedron::Facet_handle Facet_handle;
};
typedef Get_<Polyhedron, boost::is_const<Polyhedron>::value> Get;
public:
typedef typename Get::Facet_iterator Facet_iterator;
typedef typename Get::Facet_handle Facet_handle;
};
}// namespace internal
////////////////////////////////////////////////////////////////////////////////////
@ -245,8 +222,16 @@ self_intersect(Polyhedron& polyhedron, OutputIterator out, const GeomTraits& geo
{
CGAL_assertion(polyhedron.is_pure_triangle());
typedef typename internal::Facet_handle_types<Polyhedron>::Facet_iterator Facet_it;
typedef typename internal::Facet_handle_types<Polyhedron>::Facet_handle Facet_hdl;
typedef typename boost::conditional< boost::is_const<Polyhedron>::value,
typename Polyhedron::Facet_const_iterator,
typename Polyhedron::Facet_iterator
>::type Facet_it;
typedef typename boost::conditional< boost::is_const<Polyhedron>::value,
typename Polyhedron::Facet_const_handle,
typename Polyhedron::Facet_handle
>::type Facet_hdl;
typedef typename CGAL::Box_intersection_d::Box_with_handle_d<double, 3, Facet_hdl> Box;
// make one box per facet