move macros in BaseDoxyfile

2022-01-04 10:49:07 +01:00 · 2022-01-04 10:49:07 +01:00 · a6d9b99466
parent 047ddad86c
commit a6d9b99466
43 changed files with 31 additions and 229 deletions
--- a/BGL/doc/BGL/Doxyfile.in
+++ b/BGL/doc/BGL/Doxyfile.in
@ -35,13 +35,6 @@ EXTRACT_ALL=NO
 HIDE_UNDOC_MEMBERS         =  YES
 HIDE_UNDOC_CLASSES         =  YES

-MACRO_EXPANSION        = YES
-EXPAND_ONLY_PREDEF     = YES
-EXPAND_AS_DEFINED      = CGAL_BGL_NP_TEMPLATE_PARAMETERS \
-                         CGAL_BGL_NP_CLASS \
-                         CGAL_DEPRECATED
-
-
 # macros to be used inside the code
 ALIASES += "cgalAssociatedTypesBegin=<dl class=\"params\"><dt>Associated Types</dt><dd> <table class=\"params\">"
 ALIASES += "cgalAssociatedTypesEnd=</table> </dd> </dl>"
--- a/BGL/include/CGAL/boost/graph/Face_filtered_graph.h
+++ b/BGL/include/CGAL/boost/graph/Face_filtered_graph.h
@ -32,11 +32,6 @@
 #include <utility>
 #include <vector>

-#ifdef DOXYGEN_RUNNING
-#define CGAL_BGL_NP_TEMPLATE_PARAMETERS NamedParameters
-#define CGAL_BGL_NP_CLASS NamedParameters
-#endif
-
 namespace CGAL {

  /*!
--- a/BGL/include/CGAL/boost/graph/IO/GOCAD.h
+++ b/BGL/include/CGAL/boost/graph/IO/GOCAD.h
@ -25,11 +25,6 @@
 #include <iostream>
 #include <utility>

-#ifdef DOXYGEN_RUNNING
-#define CGAL_BGL_NP_TEMPLATE_PARAMETERS NamedParameters
-#define CGAL_BGL_NP_CLASS NamedParameters
-#endif
-
 namespace CGAL {

 ////////////////////////////////////////////////////////////////////////////////////////////////////
--- a/BGL/include/CGAL/boost/graph/IO/OBJ.h
+++ b/BGL/include/CGAL/boost/graph/IO/OBJ.h
@ -28,11 +28,6 @@
 #include <utility>
 #include <vector>

-#ifdef DOXYGEN_RUNNING
-#define CGAL_BGL_NP_TEMPLATE_PARAMETERS NamedParameters
-#define CGAL_BGL_NP_CLASS NamedParameters
-#endif
-
 namespace CGAL {

 ////////////////////////////////////////////////////////////////////////////////////////////////////
--- a/BGL/include/CGAL/boost/graph/IO/OFF.h
+++ b/BGL/include/CGAL/boost/graph/IO/OFF.h
@ -28,12 +28,6 @@
 #include <iostream>
 #include <string>

-#ifdef DOXYGEN_RUNNING
-#define CGAL_BGL_NP_TEMPLATE_PARAMETERS NamedParameters
-#define CGAL_BGL_NP_CLASS NamedParameters
-#define CGAL_DEPRECATED
-#endif
-
 namespace CGAL {

 ////////////////////////////////////////////////////////////////////////////////////////////////////
--- a/BGL/include/CGAL/boost/graph/IO/PLY.h
+++ b/BGL/include/CGAL/boost/graph/IO/PLY.h
@ -24,11 +24,6 @@
 #include <fstream>
 #include <string>

-#ifdef DOXYGEN_RUNNING
-#define CGAL_BGL_NP_TEMPLATE_PARAMETERS NamedParameters
-#define CGAL_BGL_NP_CLASS NamedParameters
-#endif
-
 namespace CGAL {

 ////////////////////////////////////////////////////////////////////////////////////////////////////
--- a/BGL/include/CGAL/boost/graph/IO/STL.h
+++ b/BGL/include/CGAL/boost/graph/IO/STL.h
@ -23,11 +23,6 @@
 #include <iostream>
 #include <string>

-#ifdef DOXYGEN_RUNNING
-#define CGAL_BGL_NP_TEMPLATE_PARAMETERS NamedParameters
-#define CGAL_BGL_NP_CLASS NamedParameters
-#endif
-
 namespace CGAL {

 ////////////////////////////////////////////////////////////////////////////////////////////////////
--- a/BGL/include/CGAL/boost/graph/IO/VTK.h
+++ b/BGL/include/CGAL/boost/graph/IO/VTK.h
@ -32,12 +32,6 @@

 #if defined(CGAL_USE_VTK) || defined(DOXYGEN_RUNNING)

-#ifdef DOXYGEN_RUNNING
-#define CGAL_BGL_NP_TEMPLATE_PARAMETERS NamedParameters
-#define CGAL_BGL_NP_CLASS NamedParameters
-#define CGAL_DEPRECATED
-#endif
-
 namespace CGAL {

 ////////////////////////////////////////////////////////////////////////////////////////////////////
--- a/BGL/include/CGAL/boost/graph/IO/WRL.h
+++ b/BGL/include/CGAL/boost/graph/IO/WRL.h
@ -22,12 +22,6 @@
 #include <fstream>
 #include <string>

-#ifdef DOXYGEN_RUNNING
-#define CGAL_BGL_NP_TEMPLATE_PARAMETERS NamedParameters
-#define CGAL_BGL_NP_CLASS NamedParameters
-#define CGAL_DEPRECATED
-#endif
-
 namespace CGAL {

 namespace IO {
--- a/Documentation/doc/resources/1.8.13/BaseDoxyfile.in
+++ b/Documentation/doc/resources/1.8.13/BaseDoxyfile.in
@ -2132,7 +2132,7 @@ ENABLE_PREPROCESSING   = YES
 # The default value is: NO.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.

-MACRO_EXPANSION        = NO
+MACRO_EXPANSION        = YES

 # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
 # the macro expansion is limited to the macros specified with the PREDEFINED and
@ -2140,7 +2140,7 @@ MACRO_EXPANSION        = NO
 # The default value is: NO.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.

-EXPAND_ONLY_PREDEF     = NO
+EXPAND_ONLY_PREDEF     = YES

 # If the SEARCH_INCLUDES tag is set to YES, the include files in the
 # INCLUDE_PATH will be searched if a #include is found.
@ -2172,7 +2172,10 @@ INCLUDE_FILE_PATTERNS  =
 # recursively expanded use the := operator instead of the = operator.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.

-PREDEFINED             = DOXYGEN_RUNNING
+PREDEFINED             = DOXYGEN_RUNNING \
+                         "CGAL_BGL_NP_TEMPLATE_PARAMETERS=NamedParameters" \
+                         "CGAL_BGL_NP_CLASS=NamedParameters" \
+                         CGAL_DEPRECATED

 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The
--- a/Documentation/doc/resources/1.8.14/BaseDoxyfile.in
+++ b/Documentation/doc/resources/1.8.14/BaseDoxyfile.in
@ -2120,7 +2120,7 @@ ENABLE_PREPROCESSING   = YES
 # The default value is: NO.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.

-MACRO_EXPANSION        = NO
+MACRO_EXPANSION        = YES

 # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
 # the macro expansion is limited to the macros specified with the PREDEFINED and
@ -2128,7 +2128,7 @@ MACRO_EXPANSION        = NO
 # The default value is: NO.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.

-EXPAND_ONLY_PREDEF     = NO
+EXPAND_ONLY_PREDEF     = YES

 # If the SEARCH_INCLUDES tag is set to YES, the include files in the
 # INCLUDE_PATH will be searched if a #include is found.
@ -2160,7 +2160,10 @@ INCLUDE_FILE_PATTERNS  =
 # recursively expanded use the := operator instead of the = operator.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.

-PREDEFINED             = DOXYGEN_RUNNING
+PREDEFINED             = DOXYGEN_RUNNING \
+                         "CGAL_BGL_NP_TEMPLATE_PARAMETERS=NamedParameters" \
+                         "CGAL_BGL_NP_CLASS=NamedParameters" \
+                         CGAL_DEPRECATED

 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The
--- a/Documentation/doc/resources/1.8.20/BaseDoxyfile.in
+++ b/Documentation/doc/resources/1.8.20/BaseDoxyfile.in
@ -2203,7 +2203,7 @@ ENABLE_PREPROCESSING   = YES
 # The default value is: NO.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.

-MACRO_EXPANSION        = NO
+MACRO_EXPANSION        = YES

 # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
 # the macro expansion is limited to the macros specified with the PREDEFINED and
@ -2211,7 +2211,7 @@ MACRO_EXPANSION        = NO
 # The default value is: NO.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.

-EXPAND_ONLY_PREDEF     = NO
+EXPAND_ONLY_PREDEF     = YES

 # If the SEARCH_INCLUDES tag is set to YES, the include files in the
 # INCLUDE_PATH will be searched if a #include is found.
@ -2243,7 +2243,10 @@ INCLUDE_FILE_PATTERNS  =
 # recursively expanded use the := operator instead of the = operator.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.

-PREDEFINED             = DOXYGEN_RUNNING
+PREDEFINED             = DOXYGEN_RUNNING \
+                         "CGAL_BGL_NP_TEMPLATE_PARAMETERS=NamedParameters" \
+                         "CGAL_BGL_NP_CLASS=NamedParameters" \
+                         CGAL_DEPRECATED

 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The
--- a/Documentation/doc/resources/1.8.4/BaseDoxyfile.in
+++ b/Documentation/doc/resources/1.8.4/BaseDoxyfile.in
@ -1726,13 +1726,13 @@ ENABLE_PREPROCESSING   = YES
 # compilation will be performed. Macro expansion can be done in a controlled
 # way by setting EXPAND_ONLY_PREDEF to YES.

-MACRO_EXPANSION        = NO
+MACRO_EXPANSION        = YES

 # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
 # then the macro expansion is limited to the macros specified with the
 # PREDEFINED and EXPAND_AS_DEFINED tags.

-EXPAND_ONLY_PREDEF     = NO
+EXPAND_ONLY_PREDEF     = YES

 # If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
 # pointed to by INCLUDE_PATH will be searched when a #include is found.
@ -1760,7 +1760,10 @@ INCLUDE_FILE_PATTERNS  =
 # undefined via #undef or recursively expanded use the := operator
 # instead of the = operator.

-PREDEFINED             = DOXYGEN_RUNNING
+PREDEFINED             = DOXYGEN_RUNNING \
+                         "CGAL_BGL_NP_TEMPLATE_PARAMETERS=NamedParameters" \
+                         "CGAL_BGL_NP_CLASS=NamedParameters" \
+                         CGAL_DEPRECATED

 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
 # this tag can be used to specify a list of macro names that should be expanded.
--- a/Documentation/doc/resources/1.9.3/BaseDoxyfile.in
+++ b/Documentation/doc/resources/1.9.3/BaseDoxyfile.in
@ -2203,7 +2203,7 @@ ENABLE_PREPROCESSING   = YES
 # The default value is: NO.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.

-MACRO_EXPANSION        = NO
+MACRO_EXPANSION        = YES

 # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
 # the macro expansion is limited to the macros specified with the PREDEFINED and
@ -2211,7 +2211,7 @@ MACRO_EXPANSION        = NO
 # The default value is: NO.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.

-EXPAND_ONLY_PREDEF     = NO
+EXPAND_ONLY_PREDEF     = YES

 # If the SEARCH_INCLUDES tag is set to YES, the include files in the
 # INCLUDE_PATH will be searched if a #include is found.
@ -2243,7 +2243,11 @@ INCLUDE_FILE_PATTERNS  =
 # recursively expanded use the := operator instead of the = operator.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.

-PREDEFINED             = DOXYGEN_RUNNING
+PREDEFINED             = DOXYGEN_RUNNING \
+                         "CGAL_BGL_NP_TEMPLATE_PARAMETERS=NamedParameters" \
+                         "CGAL_BGL_NP_CLASS=NamedParameters" \
+                         CGAL_DEPRECATED
+                        

 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The
--- a/Optimal_bounding_box/doc/Optimal_bounding_box/Doxyfile.in
+++ b/Optimal_bounding_box/doc/Optimal_bounding_box/Doxyfile.in
@ -5,10 +5,6 @@ EXTRACT_ALL                =  false
 HIDE_UNDOC_CLASSES         =  true
 WARN_IF_UNDOCUMENTED       =  true

-MACRO_EXPANSION        = YES
-EXPAND_ONLY_PREDEF     = YES
-EXPAND_AS_DEFINED      = CGAL_BGL_NP_TEMPLATE_PARAMETERS \
-                         CGAL_BGL_NP_CLASS
 EXCLUDE = ${CGAL_PACKAGE_INCLUDE_DIR}/CGAL/Optimal_bounding_box/internal
 EXCLUDE_SYMBOLS += experimental

--- a/Optimal_bounding_box/include/CGAL/Optimal_bounding_box/oriented_bounding_box.h
+++ b/Optimal_bounding_box/include/CGAL/Optimal_bounding_box/oriented_bounding_box.h
@ -44,11 +44,6 @@
 #include <type_traits>
 #include <vector>

-#ifdef DOXYGEN_RUNNING
-#define CGAL_BGL_NP_TEMPLATE_PARAMETERS NamedParameters
-#define CGAL_BGL_NP_CLASS NamedParameters
-#endif
-
 namespace CGAL {
 namespace Optimal_bounding_box {
 namespace internal {
--- a/Point_set_3/doc/Point_set_3/Doxyfile.in
+++ b/Point_set_3/doc/Point_set_3/Doxyfile.in
@ -1,8 +1,2 @@
@INCLUDE = ${CGAL_DOC_PACKAGE_DEFAULTS}
 PROJECT_NAME = "CGAL ${CGAL_DOC_VERSION} - 3D Point Set"
-
-MACRO_EXPANSION        = YES
-EXPAND_ONLY_PREDEF     = YES
-EXPAND_AS_DEFINED      = CGAL_BGL_NP_TEMPLATE_PARAMETERS \
-                         CGAL_BGL_NP_CLASS \
-                         CGAL_DEPRECATED
--- a/Point_set_3/include/CGAL/Point_set_3/IO.h
+++ b/Point_set_3/include/CGAL/Point_set_3/IO.h
@ -24,11 +24,6 @@
 #include <fstream>
 #include <string>

-#ifdef DOXYGEN_RUNNING
-#define CGAL_BGL_NP_TEMPLATE_PARAMETERS NamedParameters
-#define CGAL_BGL_NP_CLASS NamedParameters
-#endif
-
 namespace CGAL {

 template <typename Point, typename Vector>
--- a/Point_set_3/include/CGAL/Point_set_3/IO/OFF.h
+++ b/Point_set_3/include/CGAL/Point_set_3/IO/OFF.h
@ -22,12 +22,6 @@
 #include <fstream>
 #include <string>

-#ifdef DOXYGEN_RUNNING
-#define CGAL_BGL_NP_TEMPLATE_PARAMETERS NamedParameters
-#define CGAL_BGL_NP_CLASS NamedParameters
-#define CGAL_DEPRECATED
-#endif
-
 namespace CGAL {

 template <typename Point, typename Vector>
--- a/Point_set_3/include/CGAL/Point_set_3/IO/PLY.h
+++ b/Point_set_3/include/CGAL/Point_set_3/IO/PLY.h
@ -22,12 +22,6 @@
 #include <string>
 #include <vector>

-#ifdef DOXYGEN_RUNNING
-#define CGAL_BGL_NP_TEMPLATE_PARAMETERS NamedParameters
-#define CGAL_BGL_NP_CLASS NamedParameters
-#define CGAL_DEPRECATED
-#endif
-
 namespace CGAL {

 template <typename Point, typename Vector>
--- a/Point_set_3/include/CGAL/Point_set_3/IO/XYZ.h
+++ b/Point_set_3/include/CGAL/Point_set_3/IO/XYZ.h
@ -21,12 +21,6 @@
 #include <fstream>
 #include <string>

-#ifdef DOXYGEN_RUNNING
-#define CGAL_BGL_NP_TEMPLATE_PARAMETERS NamedParameters
-#define CGAL_BGL_NP_CLASS NamedParameters
-#define CGAL_DEPRECATED
-#endif
-
 namespace CGAL {

 template <typename Point, typename Vector>
--- a/Point_set_processing_3/doc/Point_set_processing_3/Doxyfile.in
+++ b/Point_set_processing_3/doc/Point_set_processing_3/Doxyfile.in
@ -2,9 +2,3 @@

 PROJECT_NAME = "CGAL ${CGAL_DOC_VERSION} - Point Set Processing"
 EXCLUDE_PATTERNS          +=  property_map.h
-
-MACRO_EXPANSION        = YES
-EXPAND_ONLY_PREDEF     = YES
-EXPAND_AS_DEFINED      = CGAL_BGL_NP_TEMPLATE_PARAMETERS \
-                         CGAL_BGL_NP_CLASS \
-                         CGAL_DEPRECATED
--- a/Point_set_processing_3/include/CGAL/IO/read_las_points.h
+++ b/Point_set_processing_3/include/CGAL/IO/read_las_points.h
@ -56,12 +56,6 @@
 #  pragma warning(pop)
 #endif

-#ifdef DOXYGEN_RUNNING
-#define CGAL_BGL_NP_TEMPLATE_PARAMETERS NamedParameters
-#define CGAL_BGL_NP_CLASS NamedParameters
-#define CGAL_DEPRECATED
-#endif
-
 namespace CGAL {

 namespace IO {
--- a/Point_set_processing_3/include/CGAL/IO/read_off_points.h
+++ b/Point_set_processing_3/include/CGAL/IO/read_off_points.h
@ -32,12 +32,6 @@
 #include <string>
 #include <type_traits>

-#ifdef DOXYGEN_RUNNING
-#define CGAL_BGL_NP_TEMPLATE_PARAMETERS NamedParameters
-#define CGAL_BGL_NP_CLASS NamedParameters
-#define CGAL_DEPRECATED
-#endif
-
 namespace CGAL {

 namespace IO {
--- a/Point_set_processing_3/include/CGAL/IO/read_ply_points.h
+++ b/Point_set_processing_3/include/CGAL/IO/read_ply_points.h
@ -35,12 +35,6 @@
 #include <string>
 #include <tuple>

-#ifdef DOXYGEN_RUNNING
-#define CGAL_BGL_NP_TEMPLATE_PARAMETERS NamedParameters
-#define CGAL_BGL_NP_CLASS NamedParameters
-#define CGAL_DEPRECATED
-#endif
-
 namespace CGAL {

 namespace IO {
--- a/Point_set_processing_3/include/CGAL/IO/read_xyz_points.h
+++ b/Point_set_processing_3/include/CGAL/IO/read_xyz_points.h
@ -29,12 +29,6 @@
 #include <sstream>
 #include <string>

-#ifdef DOXYGEN_RUNNING
-#define CGAL_BGL_NP_TEMPLATE_PARAMETERS NamedParameters
-#define CGAL_BGL_NP_CLASS NamedParameters
-#define CGAL_DEPRECATED
-#endif
-
 namespace CGAL {

 namespace IO {
--- a/Point_set_processing_3/include/CGAL/IO/write_las_points.h
+++ b/Point_set_processing_3/include/CGAL/IO/write_las_points.h
@ -58,12 +58,6 @@
 #include <string>
 #include <tuple>

-#ifdef DOXYGEN_RUNNING
-#define CGAL_BGL_NP_TEMPLATE_PARAMETERS NamedParameters
-#define CGAL_BGL_NP_CLASS NamedParameters
-#define CGAL_DEPRECATED
-#endif
-
 namespace CGAL {

 namespace IO {
--- a/Point_set_processing_3/include/CGAL/IO/write_off_points.h
+++ b/Point_set_processing_3/include/CGAL/IO/write_off_points.h
@ -30,11 +30,6 @@
 #include <fstream>
 #include <iterator>

-#ifdef DOXYGEN_RUNNING
-#define CGAL_BGL_NP_TEMPLATE_PARAMETERS NamedParameters
-#define CGAL_BGL_NP_CLASS NamedParameters
-#endif
-
 namespace CGAL {
 namespace Point_set_processing_3 {
 namespace internal {
--- a/Point_set_processing_3/include/CGAL/IO/write_ply_points.h
+++ b/Point_set_processing_3/include/CGAL/IO/write_ply_points.h
@ -32,12 +32,6 @@
 #include <iterator>
 #include <tuple>

-#ifdef DOXYGEN_RUNNING
-#define CGAL_BGL_NP_TEMPLATE_PARAMETERS NamedParameters
-#define CGAL_BGL_NP_CLASS NamedParameters
-#define CGAL_DEPRECATED
-#endif
-
 namespace CGAL {

 namespace IO {
--- a/Point_set_processing_3/include/CGAL/IO/write_points.h
+++ b/Point_set_processing_3/include/CGAL/IO/write_points.h
@ -26,11 +26,6 @@
 #include <iostream>
 #include <fstream>

-#ifdef DOXYGEN_RUNNING
-#define CGAL_BGL_NP_TEMPLATE_PARAMETERS NamedParameters
-#define CGAL_BGL_NP_CLASS NamedParameters
-#endif
-
 namespace CGAL {

 namespace IO {
--- a/Point_set_processing_3/include/CGAL/IO/write_xyz_points.h
+++ b/Point_set_processing_3/include/CGAL/IO/write_xyz_points.h
@ -30,12 +30,6 @@
 #include <fstream>
 #include <iterator>

-#ifdef DOXYGEN_RUNNING
-#define CGAL_BGL_NP_TEMPLATE_PARAMETERS NamedParameters
-#define CGAL_BGL_NP_CLASS NamedParameters
-#define CGAL_DEPRECATED
-#endif
-
 namespace CGAL {
 namespace Point_set_processing_3 {
 namespace internal {
--- a/Point_set_processing_3/include/CGAL/compute_average_spacing.h
+++ b/Point_set_processing_3/include/CGAL/compute_average_spacing.h
@ -34,13 +34,6 @@
 #include <iterator>
 #include <list>

-
-
-#ifdef DOXYGEN_RUNNING
-#define CGAL_BGL_NP_TEMPLATE_PARAMETERS NamedParameters
-#define CGAL_BGL_NP_CLASS NamedParameters
-#endif
-
 namespace CGAL {


--- a/Shape_regularization/doc/Shape_regularization/Doxyfile.in
+++ b/Shape_regularization/doc/Shape_regularization/Doxyfile.in
@ -3,8 +3,3 @@
 PROJECT_NAME = "CGAL ${CGAL_DOC_VERSION} - Shape Regularization"

 EXTRACT_ALL = false
-
-MACRO_EXPANSION    = YES
-EXPAND_ONLY_PREDEF = YES
-EXPAND_AS_DEFINED  = CGAL_BGL_NP_TEMPLATE_PARAMETERS \
-  CGAL_BGL_NP_CLASS
--- a/Stream_support/doc/Stream_support/Doxyfile.in
+++ b/Stream_support/doc/Stream_support/Doxyfile.in
@ -6,9 +6,3 @@ EXAMPLE_PATH = ${CGAL_PACKAGE_DIR}/examples
 EXTRACT_ALL                =  false
 HIDE_UNDOC_MEMBERS         =  true
 HIDE_UNDOC_CLASSES         =  true
-
-MACRO_EXPANSION        = YES
-EXPAND_ONLY_PREDEF     = YES
-EXPAND_AS_DEFINED      = CGAL_BGL_NP_TEMPLATE_PARAMETERS \
-                         CGAL_BGL_NP_CLASS
-
--- a/Stream_support/include/CGAL/IO/OBJ.h
+++ b/Stream_support/include/CGAL/IO/OBJ.h
@ -31,11 +31,6 @@
 #include <string>
 #include <vector>

-#ifdef DOXYGEN_RUNNING
-#define CGAL_BGL_NP_TEMPLATE_PARAMETERS NamedParameters
-#define CGAL_BGL_NP_CLASS NamedParameters
-#endif
-
 namespace CGAL {

 ////////////////////////////////////////////////////////////////////////////////////////////////////
--- a/Stream_support/include/CGAL/IO/OFF.h
+++ b/Stream_support/include/CGAL/IO/OFF.h
@ -32,11 +32,6 @@
 #include <iostream>
 #include <vector>

-#ifdef DOXYGEN_RUNNING
-#define CGAL_BGL_NP_TEMPLATE_PARAMETERS NamedParameters
-#define CGAL_BGL_NP_CLASS NamedParameters
-#endif
-
 namespace CGAL {

 ////////////////////////////////////////////////////////////////////////////////////////////////////
--- a/Stream_support/include/CGAL/IO/PLY.h
+++ b/Stream_support/include/CGAL/IO/PLY.h
@ -32,11 +32,6 @@
 #include <utility>
 #include <vector>

-#ifdef DOXYGEN_RUNNING
-#define CGAL_BGL_NP_TEMPLATE_PARAMETERS NamedParameters
-#define CGAL_BGL_NP_CLASS NamedParameters
-#endif
-
 namespace CGAL {

 ////////////////////////////////////////////////////////////////////////////////////////////////////
--- a/Stream_support/include/CGAL/IO/STL.h
+++ b/Stream_support/include/CGAL/IO/STL.h
@ -29,11 +29,6 @@
 #include <fstream>
 #include <string>

-#ifdef DOXYGEN_RUNNING
-#define CGAL_BGL_NP_TEMPLATE_PARAMETERS NamedParameters
-#define CGAL_BGL_NP_CLASS NamedParameters
-#endif
-
 namespace CGAL {

 namespace IO {
--- a/Stream_support/include/CGAL/IO/VTK.h
+++ b/Stream_support/include/CGAL/IO/VTK.h
@ -32,11 +32,6 @@

 #if defined(CGAL_USE_VTK) || defined(DOXYGEN_RUNNING)

-#ifdef DOXYGEN_RUNNING
-#define CGAL_BGL_NP_TEMPLATE_PARAMETERS NamedParameters
-#define CGAL_BGL_NP_CLASS NamedParameters
-#endif
-
 namespace CGAL {
 namespace IO {
 namespace internal {
--- a/Surface_mesh/doc/Surface_mesh/Doxyfile.in
+++ b/Surface_mesh/doc/Surface_mesh/Doxyfile.in
@ -1,9 +1,2 @@
@INCLUDE = ${CGAL_DOC_PACKAGE_DEFAULTS}
 PROJECT_NAME = "CGAL ${CGAL_DOC_VERSION} - Surface Mesh"
-
-MACRO_EXPANSION        = YES
-EXPAND_ONLY_PREDEF     = YES
-EXPAND_AS_DEFINED      = CGAL_BGL_NP_TEMPLATE_PARAMETERS \
-                         CGAL_BGL_NP_CLASS \
-                         CGAL_DEPRECATED
-
--- a/Surface_mesh/include/CGAL/Surface_mesh/IO/OFF.h
+++ b/Surface_mesh/include/CGAL/Surface_mesh/IO/OFF.h
@ -25,12 +25,6 @@
 #include <iostream>
 #include <tuple>

-#ifdef DOXYGEN_RUNNING
-#define CGAL_BGL_NP_TEMPLATE_PARAMETERS NamedParameters
-#define CGAL_BGL_NP_CLASS NamedParameters
-#define CGAL_DEPRECATED
-#endif
-
 namespace CGAL {

 ////////////////////////////////////////////////////////////////////////////////////////////////////
--- a/Surface_mesh/include/CGAL/Surface_mesh/IO/PLY.h
+++ b/Surface_mesh/include/CGAL/Surface_mesh/IO/PLY.h
@ -23,12 +23,6 @@

 #include <CGAL/IO/PLY.h>

-#ifdef DOXYGEN_RUNNING
-#define CGAL_BGL_NP_TEMPLATE_PARAMETERS NamedParameters
-#define CGAL_BGL_NP_CLASS NamedParameters
-#define CGAL_DEPRECATED
-#endif
-
 namespace CGAL {
 namespace IO {
 namespace internal {
--- a/Triangulation_on_sphere_2/include/CGAL/Triangulation_on_sphere_2/IO/OFF.h
+++ b/Triangulation_on_sphere_2/include/CGAL/Triangulation_on_sphere_2/IO/OFF.h
@ -24,12 +24,6 @@
 #include <string>
 #include <unordered_map>

-#ifdef DOXYGEN_RUNNING
-#define CGAL_BGL_NP_TEMPLATE_PARAMETERS NamedParameters
-#define CGAL_BGL_NP_CLASS NamedParameters
-#define CGAL_DEPRECATED
-#endif
-
 namespace CGAL {

 template <typename Gt, typename Tds>