From 1ab17e218646eda6f3657d9a42c2087c2b42f648 Mon Sep 17 00:00:00 2001 From: Sylvain Pion Date: Wed, 16 Jul 2008 07:21:40 +0000 Subject: [PATCH] Disable the remaining short names macros (to be removed after 3.4). --- .../include/CGAL/Apollonius_graph_2/short_names_2.h | 2 ++ .../include/CGAL/Segment_Delaunay_graph_2/short_names_2.h | 2 ++ .../include/CGAL/Voronoi_diagram_2/short_names_2.h | 2 ++ 3 files changed, 6 insertions(+) diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/short_names_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/short_names_2.h index 2a1b44bea00..0d9ad196616 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/short_names_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/short_names_2.h @@ -22,6 +22,7 @@ #ifndef CGAL_APOLLONIUS_GRAPH_2_SHORT_NAMES_2_H #define CGAL_APOLLONIUS_GRAPH_2_SHORT_NAMES_2_H +#if 0 // Disabled to see if it's still really needed. #define Apollonius_site_2 As2 #define Apollonius_graph_2 Ag2 @@ -34,5 +35,6 @@ #define Apollonius_graph_traits_wrapper_2 Agtw2 #define Apollonius_graph_kernel_wrapper_2 Agkw2 +#endif // 0 #endif //CGAL_APOLLONIUS_GRAPH_2_SHORT_NAMES_2_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/short_names_2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/short_names_2.h index 40f479cf4ee..585c0e8c782 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/short_names_2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/short_names_2.h @@ -22,6 +22,7 @@ #ifndef CGAL_SEGMENT_DELAUNAY_GRAPH_2_SHORT_NAMES_2_H #define CGAL_SEGMENT_DELAUNAY_GRAPH_2_SHORT_NAMES_2_H +#if 0 // Disabled to see if it's still really needed. #define Segment_Delaunay_graph_site_2 Sdgs2 #define Segment_Delaunay_graph_simple_site_2 Sdgsims2 @@ -36,5 +37,6 @@ #define Segment_Delaunay_graph_traits_wrapper_2 Sdgtw2 #define Segment_Delaunay_graph_kernel_wrapper_2 Sdgkw2 +#endif // 0 #endif //CGAL_SEGMENT_DELAUNAY_GRAPH_2_SHORT_NAMES_2_H diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/short_names_2.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/short_names_2.h index d9a453d2024..221323fbcc1 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/short_names_2.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/short_names_2.h @@ -20,6 +20,7 @@ #ifndef CGAL_VORONOI_DIAGRAM_2_SHORT_NAMES_2_H #define CGAL_VORONOI_DIAGRAM_2_SHORT_NAMES_2_H 1 +#if 0 // Disabled to see if it's still really needed. #define Voronoi_diagram_2 Vd2 #define Delaunay_triangulation_adaptation_traits_2 Dtat2 @@ -27,5 +28,6 @@ #define Apollonius_graph_adaptation_traits_2 Agat2 #define Segment_Delaunay_graph_adaptation_traits_2 Sdgat2 +#endif // 0 #endif // CGAL_VORONOI_DIAGRAM_2_SHORT_NAMES_2_H