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

Move 'GetK' from ::CGAL::PMP:: to ::CGAL::

This commit is contained in:
Mael Rouxel-Labbé 2020-05-27 09:21:44 +02:00
parent 5bc7eff657
commit a14d2df1d9
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BGL/include/CGAL/boost/graph/IO/Generic_facegraph_builder.h
View File

@ -41,8 +41,7 @@ public:
template <typename NamedParameters>
bool operator()(FaceGraph& g, const NamedParameters& np)
{
// @fixme move to CGAL namespace
typedef typename Polygon_mesh_processing::GetK<FaceGraph, NamedParameters>::Kernel Kernel;
typedef typename GetK<FaceGraph, NamedParameters>::Kernel Kernel;
typedef typename Kernel::Vector_3 Vector;
typedef typename Kernel::Point_2 Texture;
typedef CGAL::Color Color;

4
BGL/include/CGAL/boost/graph/IO/Generic_facegraph_printer.h
View File

@ -41,10 +41,10 @@ public:
bool operator()(const FaceGraph& g,
const NamedParameters& np)
{
typedef typename CGAL::GetVertexPointMap<FaceGraph, NamedParameters>::const_type VPM;
typedef typename GetVertexPointMap<FaceGraph, NamedParameters>::const_type VPM;
typedef typename boost::property_traits<VPM>::reference Point_ref;
typedef typename Polygon_mesh_processing::GetK<FaceGraph, NamedParameters>::Kernel Kernel;
typedef typename GetK<FaceGraph, NamedParameters>::Kernel Kernel;
typedef typename Kernel::Vector_3 Vector;
typedef typename Kernel::Point_2 Texture;
typedef CGAL::Color Color;

6
BGL/include/CGAL/boost/graph/named_params_helper.h
View File

@ -138,8 +138,6 @@ namespace CGAL {
> ::type const_type;
};
namespace Polygon_mesh_processing {
template<typename PolygonMesh, typename NamedParameters>
class GetK
{
@ -150,8 +148,6 @@ namespace CGAL {
typedef typename CGAL::Kernel_traits<Point>::Kernel Kernel;
};
} // namespace Polygon_mesh_processing
template<typename PolygonMesh,
typename NamedParametersGT = Named_function_parameters<bool, internal_np::all_default_t>,
typename NamedParametersVPM = NamedParametersGT >
@ -169,7 +165,7 @@ namespace CGAL {
struct Fake_GT {};//to be used if there is no internal vertex_point_map in PolygonMesh
typedef typename boost::mpl::if_c<Has_internal_pmap::value || !boost::is_same<internal_np::Param_not_found, NP_vpm>::value,
typename Polygon_mesh_processing::GetK<PolygonMesh, NamedParametersVPM>::Kernel,
typename GetK<PolygonMesh, NamedParametersVPM>::Kernel,
Fake_GT>::type DefaultKernel;
public: