From ae6b0f6faa0d3105eb742cb7d54049f5ce05fb0d Mon Sep 17 00:00:00 2001 From: Menelaos Karavelas Date: Thu, 25 May 2006 11:28:23 +0000 Subject: [PATCH] - moved predicate files into the Apollonius_graph_2 subdir - moved the *.C files to Apollonius_graph_2/*_impl.h - removed automatic template inclusion macros related to the *.C files --- Apollonius_graph_2/changes.txt | 5 +++++ Apollonius_graph_2/include/CGAL/Apollonius_graph_2.h | 10 ++++------ .../Apollonius_graph_2_impl.h} | 0 .../Apollonius_graph_hierarchy_2_impl.h} | 0 .../Bounded_side_of_ccw_circle_C2.h} | 0 .../Compare_weight_2.h} | 0 .../Compare_x_2.h} | 0 .../Compare_y_2.h} | 0 .../Constructions_C2.h} | 8 ++++---- .../Constructions_ftC2.h} | 6 +++--- .../Constructions_rtH2.h} | 8 ++++---- .../Finite_edge_test_C2.h} | 0 .../Incircle_C2.h} | 0 .../Infinite_edge_test_C2.h} | 0 .../Is_degenerate_edge_C2.h} | 0 .../Is_hidden_C2.h} | 0 .../Kernel_wrapper_2.h} | 8 ++++---- .../Orientation_2.h} | 0 .../Oriented_side_of_bisector_C2.h} | 0 .../Predicate_constructions_C2.h} | 0 .../Predicates_C2.h} | 0 .../Predicates_ftC2.h} | 0 .../Traits_wrapper_2.h} | 8 ++++---- .../{predicates => Apollonius_graph_2}/check_filter.h | 0 .../comparator_profiler.h | 0 .../compare_quadratic.h | 0 .../predicate_profiler.h | 0 .../short_names_2.h} | 6 +++--- .../include/CGAL/Apollonius_graph_hierarchy_2.h | 8 +++----- .../include/CGAL/Apollonius_graph_traits_2.h | 4 ++-- 30 files changed, 36 insertions(+), 35 deletions(-) rename Apollonius_graph_2/include/CGAL/{Apollonius_graph_2.C => Apollonius_graph_2/Apollonius_graph_2_impl.h} (100%) rename Apollonius_graph_2/include/CGAL/{Apollonius_graph_hierarchy_2.C => Apollonius_graph_2/Apollonius_graph_hierarchy_2_impl.h} (100%) rename Apollonius_graph_2/include/CGAL/{predicates/Ag2_bounded_side_of_ccw_circle_C2.h => Apollonius_graph_2/Bounded_side_of_ccw_circle_C2.h} (100%) rename Apollonius_graph_2/include/CGAL/{predicates/Ag2_compare_weight_2.h => Apollonius_graph_2/Compare_weight_2.h} (100%) rename Apollonius_graph_2/include/CGAL/{predicates/Ag2_compare_x_2.h => Apollonius_graph_2/Compare_x_2.h} (100%) rename Apollonius_graph_2/include/CGAL/{predicates/Ag2_compare_y_2.h => Apollonius_graph_2/Compare_y_2.h} (100%) rename Apollonius_graph_2/include/CGAL/{Apollonius_graph_constructions_C2.h => Apollonius_graph_2/Constructions_C2.h} (98%) rename Apollonius_graph_2/include/CGAL/{Apollonius_graph_constructions_ftC2.h => Apollonius_graph_2/Constructions_ftC2.h} (96%) rename Apollonius_graph_2/include/CGAL/{Apollonius_graph_constructions_rtH2.h => Apollonius_graph_2/Constructions_rtH2.h} (90%) rename Apollonius_graph_2/include/CGAL/{predicates/Ag2_finite_edge_test_C2.h => Apollonius_graph_2/Finite_edge_test_C2.h} (100%) rename Apollonius_graph_2/include/CGAL/{predicates/Ag2_incircle_C2.h => Apollonius_graph_2/Incircle_C2.h} (100%) rename Apollonius_graph_2/include/CGAL/{predicates/Ag2_infinite_edge_test_C2.h => Apollonius_graph_2/Infinite_edge_test_C2.h} (100%) rename Apollonius_graph_2/include/CGAL/{predicates/Ag2_is_degenerate_edge_C2.h => Apollonius_graph_2/Is_degenerate_edge_C2.h} (100%) rename Apollonius_graph_2/include/CGAL/{predicates/Ag2_is_hidden_C2.h => Apollonius_graph_2/Is_hidden_C2.h} (100%) rename Apollonius_graph_2/include/CGAL/{Apollonius_graph_kernel_wrapper_2.h => Apollonius_graph_2/Kernel_wrapper_2.h} (90%) rename Apollonius_graph_2/include/CGAL/{predicates/Ag2_orientation_2.h => Apollonius_graph_2/Orientation_2.h} (100%) rename Apollonius_graph_2/include/CGAL/{predicates/Ag2_oriented_side_of_bisector_C2.h => Apollonius_graph_2/Oriented_side_of_bisector_C2.h} (100%) rename Apollonius_graph_2/include/CGAL/{predicates/Apollonius_graph_predicate_constructions_C2.h => Apollonius_graph_2/Predicate_constructions_C2.h} (100%) rename Apollonius_graph_2/include/CGAL/{predicates/Apollonius_graph_predicates_C2.h => Apollonius_graph_2/Predicates_C2.h} (100%) rename Apollonius_graph_2/include/CGAL/{predicates/Apollonius_graph_ftC2.h => Apollonius_graph_2/Predicates_ftC2.h} (100%) rename Apollonius_graph_2/include/CGAL/{Apollonius_graph_traits_wrapper_2.h => Apollonius_graph_2/Traits_wrapper_2.h} (82%) rename Apollonius_graph_2/include/CGAL/{predicates => Apollonius_graph_2}/check_filter.h (100%) rename Apollonius_graph_2/include/CGAL/{predicates => Apollonius_graph_2}/comparator_profiler.h (100%) rename Apollonius_graph_2/include/CGAL/{predicates => Apollonius_graph_2}/compare_quadratic.h (100%) rename Apollonius_graph_2/include/CGAL/{predicates => Apollonius_graph_2}/predicate_profiler.h (100%) rename Apollonius_graph_2/include/CGAL/{Apollonius_graph_short_names_2.h => Apollonius_graph_2/short_names_2.h} (89%) diff --git a/Apollonius_graph_2/changes.txt b/Apollonius_graph_2/changes.txt index 4393f11882c..04782c7d263 100644 --- a/Apollonius_graph_2/changes.txt +++ b/Apollonius_graph_2/changes.txt @@ -1,3 +1,8 @@ +25 May 2006: Menelaos Karavelas +- moved predicate files into the Apollonius_graph_2 subdir +- moved the *.C files to Apollonius_graph_2/*_impl.h +- removed automatic template inclusion macros related to the *.C files + 2 May 2006: Menelaos Karavelas - fixed bug in drawing routine of Parabola_segment_2; in somes cases the drawing routine was producing some points twice. Thanks to diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2.h index c0f48f42206..beb3f0837b5 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2.h @@ -28,7 +28,7 @@ #include -#include +#include #include #include @@ -37,9 +37,9 @@ #include #include -#include +#include -#include +#include #include #include @@ -1337,9 +1337,7 @@ std::istream& operator>>(std::istream& is, CGAL_END_NAMESPACE -#ifdef CGAL_CFG_NO_AUTOMATIC_TEMPLATE_INCLUSION -#include -#endif +#include #endif // CGAL_APOLLONIUS_GRAPH_2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2.C b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Apollonius_graph_2_impl.h similarity index 100% rename from Apollonius_graph_2/include/CGAL/Apollonius_graph_2.C rename to Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Apollonius_graph_2_impl.h diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_hierarchy_2.C b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Apollonius_graph_hierarchy_2_impl.h similarity index 100% rename from Apollonius_graph_2/include/CGAL/Apollonius_graph_hierarchy_2.C rename to Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Apollonius_graph_hierarchy_2_impl.h diff --git a/Apollonius_graph_2/include/CGAL/predicates/Ag2_bounded_side_of_ccw_circle_C2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Bounded_side_of_ccw_circle_C2.h similarity index 100% rename from Apollonius_graph_2/include/CGAL/predicates/Ag2_bounded_side_of_ccw_circle_C2.h rename to Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Bounded_side_of_ccw_circle_C2.h diff --git a/Apollonius_graph_2/include/CGAL/predicates/Ag2_compare_weight_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Compare_weight_2.h similarity index 100% rename from Apollonius_graph_2/include/CGAL/predicates/Ag2_compare_weight_2.h rename to Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Compare_weight_2.h diff --git a/Apollonius_graph_2/include/CGAL/predicates/Ag2_compare_x_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Compare_x_2.h similarity index 100% rename from Apollonius_graph_2/include/CGAL/predicates/Ag2_compare_x_2.h rename to Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Compare_x_2.h diff --git a/Apollonius_graph_2/include/CGAL/predicates/Ag2_compare_y_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Compare_y_2.h similarity index 100% rename from Apollonius_graph_2/include/CGAL/predicates/Ag2_compare_y_2.h rename to Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Compare_y_2.h diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_constructions_C2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Constructions_C2.h similarity index 98% rename from Apollonius_graph_2/include/CGAL/Apollonius_graph_constructions_C2.h rename to Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Constructions_C2.h index 6ba3ff2822a..24823348de5 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_constructions_C2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Constructions_C2.h @@ -19,8 +19,8 @@ -#ifndef CGAL_APOLLONIUS_GRAPH_CONSTRUCTIONS_2_H -#define CGAL_APOLLONIUS_GRAPH_CONSTRUCTIONS_2_H +#ifndef CGAL_APOLLONIUS_GRAPH_2_CONSTRUCTIONS_2_H +#define CGAL_APOLLONIUS_GRAPH_2_CONSTRUCTIONS_2_H #include #include @@ -28,7 +28,7 @@ #include -#include +#include @@ -427,4 +427,4 @@ public: CGAL_END_NAMESPACE -#endif // CGAL_APOLLONIUS_GRAPH_CONSTRUCTIONS_C2_H +#endif // CGAL_APOLLONIUS_GRAPH_2_CONSTRUCTIONS_C2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_constructions_ftC2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Constructions_ftC2.h similarity index 96% rename from Apollonius_graph_2/include/CGAL/Apollonius_graph_constructions_ftC2.h rename to Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Constructions_ftC2.h index ff53f5369a5..54a4b6d04f3 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_constructions_ftC2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Constructions_ftC2.h @@ -19,8 +19,8 @@ -#ifndef CGAL_APOLLONIUS_GRAPH_CONSTRUCTIONS_FTC2_H -#define CGAL_APOLLONIUS_GRAPH_CONSTRUCTIONS_FTC2_H +#ifndef CGAL_APOLLONIUS_GRAPH_2_CONSTRUCTIONS_FTC2_H +#define CGAL_APOLLONIUS_GRAPH_2_CONSTRUCTIONS_FTC2_H #include @@ -180,4 +180,4 @@ ad_left_bitangent_lineC2(const FT &x1, const FT &y1, const FT &w1, CGAL_END_NAMESPACE -#endif // CGAL_APOLLONIUS_GRAPH_CONSTRUCTIONS_FTC2_H +#endif // CGAL_APOLLONIUS_GRAPH_2_CONSTRUCTIONS_FTC2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_constructions_rtH2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Constructions_rtH2.h similarity index 90% rename from Apollonius_graph_2/include/CGAL/Apollonius_graph_constructions_rtH2.h rename to Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Constructions_rtH2.h index b95fadfa040..b232e1ab034 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_constructions_rtH2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Constructions_rtH2.h @@ -19,12 +19,12 @@ -#ifndef CGAL_APOLLONIUS_GRAPH_CONSTRUCTIONS_RTH2_H -#define CGAL_APOLLONIUS_GRAPH_CONSTRUCTIONS_RTH2_H +#ifndef CGAL_APOLLONIUS_GRAPH_2_CONSTRUCTIONS_RTH2_H +#define CGAL_APOLLONIUS_GRAPH_2_CONSTRUCTIONS_RTH2_H #include -#include +#include CGAL_BEGIN_NAMESPACE @@ -80,4 +80,4 @@ ad_left_bitangent_lineH2(const FT &hx1, const FT &hy1, const We &w1, CGAL_END_NAMESPACE -#endif // CGAL_APOLLONIUS_GRAPH_CONSTRUCTIONS_RTH2_H +#endif // CGAL_APOLLONIUS_GRAPH_2_CONSTRUCTIONS_RTH2_H diff --git a/Apollonius_graph_2/include/CGAL/predicates/Ag2_finite_edge_test_C2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Finite_edge_test_C2.h similarity index 100% rename from Apollonius_graph_2/include/CGAL/predicates/Ag2_finite_edge_test_C2.h rename to Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Finite_edge_test_C2.h diff --git a/Apollonius_graph_2/include/CGAL/predicates/Ag2_incircle_C2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Incircle_C2.h similarity index 100% rename from Apollonius_graph_2/include/CGAL/predicates/Ag2_incircle_C2.h rename to Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Incircle_C2.h diff --git a/Apollonius_graph_2/include/CGAL/predicates/Ag2_infinite_edge_test_C2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Infinite_edge_test_C2.h similarity index 100% rename from Apollonius_graph_2/include/CGAL/predicates/Ag2_infinite_edge_test_C2.h rename to Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Infinite_edge_test_C2.h diff --git a/Apollonius_graph_2/include/CGAL/predicates/Ag2_is_degenerate_edge_C2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Is_degenerate_edge_C2.h similarity index 100% rename from Apollonius_graph_2/include/CGAL/predicates/Ag2_is_degenerate_edge_C2.h rename to Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Is_degenerate_edge_C2.h diff --git a/Apollonius_graph_2/include/CGAL/predicates/Ag2_is_hidden_C2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Is_hidden_C2.h similarity index 100% rename from Apollonius_graph_2/include/CGAL/predicates/Ag2_is_hidden_C2.h rename to Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Is_hidden_C2.h diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_kernel_wrapper_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Kernel_wrapper_2.h similarity index 90% rename from Apollonius_graph_2/include/CGAL/Apollonius_graph_kernel_wrapper_2.h rename to Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Kernel_wrapper_2.h index af89c8c033d..68020655ae3 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_kernel_wrapper_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Kernel_wrapper_2.h @@ -19,10 +19,10 @@ -#ifndef CGAL_APOLLONIUS_GRAPH_KERNEL_WRAPPER_2_H -#define CGAL_APOLLONIUS_GRAPH_KERNEL_WRAPPER_2_H +#ifndef CGAL_APOLLONIUS_GRAPH_2_KERNEL_WRAPPER_2_H +#define CGAL_APOLLONIUS_GRAPH_2_KERNEL_WRAPPER_2_H -#include +#include #include #include @@ -80,4 +80,4 @@ public: CGAL_END_NAMESPACE -#endif // CGAL_APOLLONIUS_GRAPH_KERNEL_WRAPPER_2_H +#endif // CGAL_APOLLONIUS_GRAPH_2_KERNEL_WRAPPER_2_H diff --git a/Apollonius_graph_2/include/CGAL/predicates/Ag2_orientation_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Orientation_2.h similarity index 100% rename from Apollonius_graph_2/include/CGAL/predicates/Ag2_orientation_2.h rename to Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Orientation_2.h diff --git a/Apollonius_graph_2/include/CGAL/predicates/Ag2_oriented_side_of_bisector_C2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Oriented_side_of_bisector_C2.h similarity index 100% rename from Apollonius_graph_2/include/CGAL/predicates/Ag2_oriented_side_of_bisector_C2.h rename to Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Oriented_side_of_bisector_C2.h diff --git a/Apollonius_graph_2/include/CGAL/predicates/Apollonius_graph_predicate_constructions_C2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Predicate_constructions_C2.h similarity index 100% rename from Apollonius_graph_2/include/CGAL/predicates/Apollonius_graph_predicate_constructions_C2.h rename to Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Predicate_constructions_C2.h diff --git a/Apollonius_graph_2/include/CGAL/predicates/Apollonius_graph_predicates_C2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Predicates_C2.h similarity index 100% rename from Apollonius_graph_2/include/CGAL/predicates/Apollonius_graph_predicates_C2.h rename to Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Predicates_C2.h diff --git a/Apollonius_graph_2/include/CGAL/predicates/Apollonius_graph_ftC2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Predicates_ftC2.h similarity index 100% rename from Apollonius_graph_2/include/CGAL/predicates/Apollonius_graph_ftC2.h rename to Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Predicates_ftC2.h diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_traits_wrapper_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Traits_wrapper_2.h similarity index 82% rename from Apollonius_graph_2/include/CGAL/Apollonius_graph_traits_wrapper_2.h rename to Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Traits_wrapper_2.h index a3ccb4e977a..680c1f21a9b 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_traits_wrapper_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Traits_wrapper_2.h @@ -19,11 +19,11 @@ -#ifndef CGAL_APOLLONIUS_GRAPH_TRAITS_WRAPPER_2_H -#define CGAL_APOLLONIUS_GRAPH_TRAITS_WRAPPER_2_H +#ifndef CGAL_APOLLONIUS_GRAPH_2_TRAITS_WRAPPER_2_H +#define CGAL_APOLLONIUS_GRAPH_2_TRAITS_WRAPPER_2_H -#include +#include @@ -49,4 +49,4 @@ public: CGAL_END_NAMESPACE -#endif // CGAL_APOLLONIUS_GRAPH_TRAITS_WRAPPER_2_H +#endif // CGAL_APOLLONIUS_GRAPH_2_TRAITS_WRAPPER_2_H diff --git a/Apollonius_graph_2/include/CGAL/predicates/check_filter.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/check_filter.h similarity index 100% rename from Apollonius_graph_2/include/CGAL/predicates/check_filter.h rename to Apollonius_graph_2/include/CGAL/Apollonius_graph_2/check_filter.h diff --git a/Apollonius_graph_2/include/CGAL/predicates/comparator_profiler.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/comparator_profiler.h similarity index 100% rename from Apollonius_graph_2/include/CGAL/predicates/comparator_profiler.h rename to Apollonius_graph_2/include/CGAL/Apollonius_graph_2/comparator_profiler.h diff --git a/Apollonius_graph_2/include/CGAL/predicates/compare_quadratic.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/compare_quadratic.h similarity index 100% rename from Apollonius_graph_2/include/CGAL/predicates/compare_quadratic.h rename to Apollonius_graph_2/include/CGAL/Apollonius_graph_2/compare_quadratic.h diff --git a/Apollonius_graph_2/include/CGAL/predicates/predicate_profiler.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/predicate_profiler.h similarity index 100% rename from Apollonius_graph_2/include/CGAL/predicates/predicate_profiler.h rename to Apollonius_graph_2/include/CGAL/Apollonius_graph_2/predicate_profiler.h diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_short_names_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/short_names_2.h similarity index 89% rename from Apollonius_graph_2/include/CGAL/Apollonius_graph_short_names_2.h rename to Apollonius_graph_2/include/CGAL/Apollonius_graph_2/short_names_2.h index c6a206928ca..2a1b44bea00 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_short_names_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/short_names_2.h @@ -19,8 +19,8 @@ -#ifndef CGAL_APOLLONIUS_GRAPH_SHORT_NAMES_2_H -#define CGAL_APOLLONIUS_GRAPH_SHORT_NAMES_2_H +#ifndef CGAL_APOLLONIUS_GRAPH_2_SHORT_NAMES_2_H +#define CGAL_APOLLONIUS_GRAPH_2_SHORT_NAMES_2_H #define Apollonius_site_2 As2 @@ -35,4 +35,4 @@ #define Apollonius_graph_kernel_wrapper_2 Agkw2 -#endif //CGAL_APOLLONIUS_GRAPH_SHORT_NAMES_2_H +#endif //CGAL_APOLLONIUS_GRAPH_2_SHORT_NAMES_2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_hierarchy_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_hierarchy_2.h index 7bba3cbff20..f1e1edbf4dd 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_hierarchy_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_hierarchy_2.h @@ -24,7 +24,7 @@ #include -#include +#include #include @@ -34,7 +34,7 @@ #include #include -#include +#include CGAL_BEGIN_NAMESPACE @@ -347,9 +347,7 @@ std::istream& operator>>(std::istream& is, CGAL_END_NAMESPACE -#ifdef CGAL_CFG_NO_AUTOMATIC_TEMPLATE_INCLUSION -#include -#endif +#include #endif // CGAL_APOLLONIUS_GRAPH_HIERARCHY_2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_traits_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_traits_2.h index 460aa6667b1..86401f09b9e 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_traits_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_traits_2.h @@ -28,11 +28,11 @@ #endif // CGAL_REP_CLASS_DEFINED #if defined CGAL_CARTESIAN_H || defined CGAL_SIMPLE_CARTESIAN_H -#include +#include #endif #include -#include +#include