From 347a0220b34dbe3c6301b8d18503847fac16f278 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= <sebastien.loriot@cgal.org>
Date: Tue, 26 Jul 2022 18:02:33 +0200
Subject: [PATCH] restrict the parameter pack to Named_function_parameters

---
 Mesh_2/include/CGAL/lloyd_optimize_mesh_2.h            | 4 ++--
 STL_Extension/include/CGAL/Named_function_parameters.h | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Mesh_2/include/CGAL/lloyd_optimize_mesh_2.h b/Mesh_2/include/CGAL/lloyd_optimize_mesh_2.h
index f40faf77d51..7ec80b4c530 100644
--- a/Mesh_2/include/CGAL/lloyd_optimize_mesh_2.h
+++ b/Mesh_2/include/CGAL/lloyd_optimize_mesh_2.h
@@ -166,9 +166,9 @@ lloyd_optimize_mesh_2(CDT& cdt, const CGAL_NP_CLASS& np = parameters::default_va
 }
 
 #ifndef DOXYGEN_RUNNING
-  template<typename CDT, typename ... NP_PACK>
+  template<typename CDT, typename ... CGAL_NP_TEMPLATE_PARAMETERS_VARIADIC>
   Mesh_optimization_return_code
-  lloyd_optimize_mesh_2(CDT& cdt, const NP_PACK& ... nps)
+  lloyd_optimize_mesh_2(CDT& cdt, const CGAL_NP_CLASS& ... nps)
   {
     return lloyd_optimize_mesh_2(cdt, internal_np::combine_named_parameters(nps ...));
   }
diff --git a/STL_Extension/include/CGAL/Named_function_parameters.h b/STL_Extension/include/CGAL/Named_function_parameters.h
index ce108229e9d..bb07dd0f7fc 100644
--- a/STL_Extension/include/CGAL/Named_function_parameters.h
+++ b/STL_Extension/include/CGAL/Named_function_parameters.h
@@ -33,6 +33,8 @@
 #define CGAL_NP_TEMPLATE_PARAMETERS_2 NP_T2=bool, typename NP_Tag2=CGAL::internal_np::all_default_t, typename NP_Base2=CGAL::internal_np::No_property
 #define CGAL_NP_CLASS_2 CGAL::Named_function_parameters<NP_T2,NP_Tag2,NP_Base2>
 
+#define CGAL_NP_TEMPLATE_PARAMETERS_VARIADIC NP_T, typename ... NP_Tag, typename ... NP_Base
+
 namespace CGAL {
 namespace internal_np{