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

fix availability of a constructor for Polyhedron backward compatibility

This commit is contained in:
Sébastien Loriot 2014-07-01 16:13:11 +02:00
parent 83b16b3351
commit 4791498376
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
AABB_tree/include/CGAL/AABB_face_graph_triangle_primitive.h
View File

@ -27,7 +27,6 @@
#include <CGAL/Polyhedron_3_property_map.h> #include <CGAL/Polyhedron_3_property_map.h>
#include <CGAL/Default.h> #include <CGAL/Default.h>
#include <boost/mpl/has_xxx.hpp> #include <boost/mpl/has_xxx.hpp>
#include <boost/mpl/if.hpp>
namespace CGAL { namespace CGAL {
@ -35,6 +34,16 @@ namespace CGAL {
#ifndef CGAL_NO_DEPRECATED_CODE #ifndef CGAL_NO_DEPRECATED_CODE
namespace internal_aabb_tree{ namespace internal_aabb_tree{
BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(Has_facet_const_handle,Facet_const_handle,false) BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(Has_facet_const_handle,Facet_const_handle,false)
template <class FaceGraph,
bool has_facet_const_handle=Has_facet_const_handle<FaceGraph>::value>
struct Get_facet_const_handle{
typedef typename FaceGraph::Facet_const_handle type;
};
template <class FaceGraph>
struct Get_facet_const_handle<FaceGraph,false>{
typedef void* type;
};
} }
#endif #endif
@ -148,10 +157,8 @@ public:
{} {}
AABB_face_graph_triangle_primitive( AABB_face_graph_triangle_primitive(
typename boost::mpl::if_< typename internal_aabb_tree::Get_facet_const_handle<FaceGraph>::type fd,
typename internal_aabb_tree::Has_facet_const_handle<FaceGraph>::type, FaceGraph& graph
typename FaceGraph::Facet_const_handle,
void*>::type fd, FaceGraph& graph
) : Base( Id_(fd.remove_const()), ) : Base( Id_(fd.remove_const()),
Triangle_property_map(&graph), Triangle_property_map(&graph),
Point_property_map(&graph) ) Point_property_map(&graph) )