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

try to please clang

This commit is contained in:
Sébastien Loriot 2019-07-15 10:49:24 +02:00
parent adff92f8f8
commit 4ca465a81f
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Point_set_processing_3/doc/Point_set_processing_3/Doxyfile.in
View File

@ -15,3 +15,5 @@ ALIASES += "cgalNPTableEnd=</table> </dd> </dl>"
ALIASES += "cgalNPBegin{1}=<tr><td class=\"paramname\">\1 </td><td>" ALIASES += "cgalNPBegin{1}=<tr><td class=\"paramname\">\1 </td><td>"
ALIASES += "cgalNPEnd=</td></tr>" ALIASES += "cgalNPEnd=</td></tr>"
EXPAND_AS_DEFINED = CGAL_BGL_NP_TEMPLATE_PARAMETERS \
CGAL_BGL_NP_CLASS

15
Point_set_processing_3/include/CGAL/compute_average_spacing.h
View File

@ -46,6 +46,11 @@
#include <tbb/scalable_allocator.h> #include <tbb/scalable_allocator.h>
#endif // CGAL_LINKED_WITH_TBB #endif // CGAL_LINKED_WITH_TBB
#ifdef DOXYGEN_RUNNING
#define CGAL_BGL_NP_TEMPLATE_PARAMETERS NamedParameters
#define CGAL_BGL_NP_CLASS NamedParameters
#endif
namespace CGAL { namespace CGAL {
@ -184,24 +189,24 @@ compute_average_spacing(const typename Kernel::Point_3& query, ///< 3D point who
*/ */
template <typename ConcurrencyTag, template <typename ConcurrencyTag,
typename PointRange, typename PointRange,
typename NamedParameters typename CGAL_BGL_NP_TEMPLATE_PARAMETERS
> >
#ifdef DOXYGEN_RUNNING #ifdef DOXYGEN_RUNNING
FT FT
#else #else
typename Point_set_processing_3::GetK<PointRange, NamedParameters>::Kernel::FT typename Point_set_processing_3::GetK<PointRange, CGAL_BGL_NP_CLASS>::Kernel::FT
#endif #endif
compute_average_spacing( compute_average_spacing(
const PointRange& points, const PointRange& points,
unsigned int k, unsigned int k,
const NamedParameters& np) const CGAL_BGL_NP_CLASS& np)
{ {
using parameters::choose_parameter; using parameters::choose_parameter;
using parameters::get_parameter; using parameters::get_parameter;
// basic geometric types // basic geometric types
typedef typename Point_set_processing_3::GetPointMap<PointRange, NamedParameters>::const_type PointMap; typedef typename Point_set_processing_3::GetPointMap<PointRange, CGAL_BGL_NP_CLASS>::const_type PointMap;
typedef typename Point_set_processing_3::GetK<PointRange, NamedParameters>::Kernel Kernel; typedef typename Point_set_processing_3::GetK<PointRange, CGAL_BGL_NP_CLASS>::Kernel Kernel;
typedef typename Kernel::Point_3 Point; typedef typename Kernel::Point_3 Point;