From 37ada7d831f7fbe9cbdb5d3f330dc473e489a5c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20B=C3=A4sken?= <Matthias.Baesken@mpi-sb.mpg.de>
Date: Thu, 9 Jan 2003 12:53:22 +0000
Subject: [PATCH] *** empty log message ***

---
 Packages/Kernel_23/changes.txt                |   3 +
 .../CGAL/Kernel/concept_archetype_functors.h  |   6 +-
 .../concept_archetype_interface_macros.h      | 314 ++++++++++++------
 3 files changed, 216 insertions(+), 107 deletions(-)

diff --git a/Packages/Kernel_23/changes.txt b/Packages/Kernel_23/changes.txt
index 5c4336a5f1d..85c1159ed2a 100644
--- a/Packages/Kernel_23/changes.txt
+++ b/Packages/Kernel_23/changes.txt
@@ -1,3 +1,6 @@
+1.13 (9 January 2003)
+- some lines shortened
+
 1.12 (9 January 2003)
 - Just resubmit.
 
diff --git a/Packages/Kernel_23/include/CGAL/Kernel/concept_archetype_functors.h b/Packages/Kernel_23/include/CGAL/Kernel/concept_archetype_functors.h
index 6db365e14cf..239f624abd9 100644
--- a/Packages/Kernel_23/include/CGAL/Kernel/concept_archetype_functors.h
+++ b/Packages/Kernel_23/include/CGAL/Kernel/concept_archetype_functors.h
@@ -44,7 +44,8 @@ public:
     typedef Angle            result_type;
     typedef Arity_tag< 3 >   Arity;
 
-    Angle operator()(const Point_2& p, const Point_2& q, const Point_2& r) const
+    Angle operator()(const Point_2& p, const Point_2& q, 
+                     const Point_2& r) const
     { CGAL::Angle a = CGAL::RIGHT;
       return a; 
     }
@@ -58,7 +59,8 @@ public:
     typedef Angle            result_type;
     typedef Arity_tag< 3 >   Arity;
 
-    Angle operator()(const Point_3& p, const Point_3& q, const Point_3& r) const
+    Angle operator()(const Point_3& p, const Point_3& q, 
+                     const Point_3& r) const
     { CGAL::Angle a = CGAL::RIGHT;
       return a; 
     }
diff --git a/Packages/Kernel_23/include/CGAL/Kernel/concept_archetype_interface_macros.h b/Packages/Kernel_23/include/CGAL/Kernel/concept_archetype_interface_macros.h
index 40941ee7e3a..5dde409aa90 100644
--- a/Packages/Kernel_23/include/CGAL/Kernel/concept_archetype_interface_macros.h
+++ b/Packages/Kernel_23/include/CGAL/Kernel/concept_archetype_interface_macros.h
@@ -40,22 +40,26 @@ CGAL_Kernel_pred(Angle_3,
 		 angle_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_ARE_ORDERED_ALONG_LINE_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_ARE_ORDERED_ALONG_LINE_2)
 CGAL_Kernel_pred(Are_ordered_along_line_2,
 		 are_ordered_along_line_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_ARE_ORDERED_ALONG_LINE_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_ARE_ORDERED_ALONG_LINE_3)
 CGAL_Kernel_pred(Are_ordered_along_line_3,
 		 are_ordered_along_line_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_ARE_STRICTLY_ORDERED_ALONG_LINE_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_ARE_STRICTLY_ORDERED_ALONG_LINE_2)
 CGAL_Kernel_pred(Are_strictly_ordered_along_line_2,
 		 are_strictly_ordered_along_line_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_ARE_STRICTLY_ORDERED_ALONG_LINE_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_ARE_STRICTLY_ORDERED_ALONG_LINE_3)
 CGAL_Kernel_pred(Are_strictly_ordered_along_line_3,
 		 are_strictly_ordered_along_line_3_object)
 #endif
@@ -80,27 +84,32 @@ CGAL_Kernel_pred(Bounded_side_3,
 		 bounded_side_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_COLLINEAR_ARE_ORDERED_ALONG_LINE_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_COLLINEAR_ARE_ORDERED_ALONG_LINE_2)
 CGAL_Kernel_pred(Collinear_are_ordered_along_line_2,
 		 collinear_are_ordered_along_line_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_COLLINEAR_ARE_ORDERED_ALONG_LINE_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_COLLINEAR_ARE_ORDERED_ALONG_LINE_3)
 CGAL_Kernel_pred(Collinear_are_ordered_along_line_3,
 		 collinear_are_ordered_along_line_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_COLLINEAR_ARE_STRICTLY_ORDERED_ALONG_LINE_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_COLLINEAR_ARE_STRICTLY_ORDERED_ALONG_LINE_2)
 CGAL_Kernel_pred(Collinear_are_strictly_ordered_along_line_2,
 		 collinear_are_strictly_ordered_along_line_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_COLLINEAR_ARE_STRICTLY_ORDERED_ALONG_LINE_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_COLLINEAR_ARE_STRICTLY_ORDERED_ALONG_LINE_3)
 CGAL_Kernel_pred(Collinear_are_strictly_ordered_along_line_3,
 		 collinear_are_strictly_ordered_along_line_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_COLLINEAR_HAS_ON_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_COLLINEAR_HAS_ON_2)
 CGAL_Kernel_pred(Collinear_has_on_2,
 		 collinear_has_on_2_object)
 #endif
@@ -115,27 +124,32 @@ CGAL_Kernel_pred(Collinear_3,
 		 collinear_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_COMPARE_ANGLE_WITH_X_AXIS_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_COMPARE_ANGLE_WITH_X_AXIS_2)
 CGAL_Kernel_pred(Compare_angle_with_x_axis_2,
 		 compare_angle_with_x_axis_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_COMPARE_DISTANCE_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_COMPARE_DISTANCE_2)
 CGAL_Kernel_pred(Compare_distance_2,
 		 compare_distance_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_COMPARE_DISTANCE_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_COMPARE_DISTANCE_3)
 CGAL_Kernel_pred(Compare_distance_3,
 		 compare_distance_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_COMPARE_SLOPE_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_COMPARE_SLOPE_2)
 CGAL_Kernel_pred(Compare_slope_2,
 		 compare_slope_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_COMPARE_X_AT_Y_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_COMPARE_X_AT_Y_2)
 CGAL_Kernel_pred(Compare_x_at_y_2,
 		 compare_x_at_y_2_object)
 #endif
@@ -195,112 +209,134 @@ CGAL_Kernel_cons(Compute_squared_area_3,
 		 compute_squared_area_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_COMPUTE_SQUARED_DISTANCE_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_COMPUTE_SQUARED_DISTANCE_2)
 CGAL_Kernel_cons(Compute_squared_distance_2,
 		 compute_squared_distance_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_COMPUTE_SQUARED_DISTANCE_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_COMPUTE_SQUARED_DISTANCE_3)
 CGAL_Kernel_cons(Compute_squared_distance_3,
 		 compute_squared_distance_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_COMPUTE_SQUARED_LENGTH_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_COMPUTE_SQUARED_LENGTH_2)
 CGAL_Kernel_cons(Compute_squared_length_2,
 		 compute_squared_length_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_COMPUTE_SQUARED_LENGTH_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_COMPUTE_SQUARED_LENGTH_3)
 CGAL_Kernel_cons(Compute_squared_length_3,
 		 compute_squared_length_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_COMPUTE_SQUARED_RADIUS_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_COMPUTE_SQUARED_RADIUS_2)
 CGAL_Kernel_cons(Compute_squared_radius_2,
 		 compute_squared_radius_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_COMPUTE_SQUARED_RADIUS_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_COMPUTE_SQUARED_RADIUS_3)
 CGAL_Kernel_cons(Compute_squared_radius_3,
 		 compute_squared_radius_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_COMPUTE_VOLUME_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_COMPUTE_VOLUME_3)
 CGAL_Kernel_cons(Compute_volume_3,
 		 compute_volume_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_BASE_VECTOR_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_BASE_VECTOR_3)
 CGAL_Kernel_cons(Construct_base_vector_3,
 		 construct_base_vector_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_BISECTOR_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_BISECTOR_2)
 CGAL_Kernel_cons(Construct_bisector_2,
 		 construct_bisector_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_CENTER_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_CENTER_2)
 CGAL_Kernel_cons(Construct_center_2,
 		 construct_center_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_CENTER_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_CENTER_3)
 CGAL_Kernel_cons(Construct_center_3,
 		 construct_center_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_CENTROID_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_CENTROID_2)
 CGAL_Kernel_cons(Construct_centroid_2,
 		 construct_centroid_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_CENTROID_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_CENTROID_3)
 CGAL_Kernel_cons(Construct_centroid_3,
 		 construct_centroid_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_CIRCLE_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_CIRCLE_2)
 CGAL_Kernel_cons(Construct_circle_2,
 		 construct_circle_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_CIRCUMCENTER_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_CIRCUMCENTER_2)
 CGAL_Kernel_cons(Construct_circumcenter_2,
 		 construct_circumcenter_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_CIRCUMCENTER_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_CIRCUMCENTER_3)
 CGAL_Kernel_cons(Construct_circumcenter_3,
 		 construct_circumcenter_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_CROSS_PRODUCT_VECTOR_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_CROSS_PRODUCT_VECTOR_3)
 CGAL_Kernel_cons(Construct_cross_product_vector_3,
 		 construct_cross_product_vector_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_DIRECTION_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_DIRECTION_2)
 CGAL_Kernel_cons(Construct_direction_2,
 		 construct_direction_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_DIRECTION_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_DIRECTION_3)
 CGAL_Kernel_cons(Construct_direction_3,
 		 construct_direction_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_ISO_CUBOID_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_ISO_CUBOID_3)
 CGAL_Kernel_cons(Construct_iso_cuboid_3,
 		 construct_iso_cuboid_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_ISO_RECTANGLE_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_ISO_RECTANGLE_2)
 CGAL_Kernel_cons(Construct_iso_rectangle_2,
 		 construct_iso_rectangle_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_LIFTED_POINT_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_LIFTED_POINT_3)
 CGAL_Kernel_cons(Construct_lifted_point_3,
 		 construct_lifted_point_3_object)
 #endif
@@ -315,17 +351,20 @@ CGAL_Kernel_cons(Construct_line_3,
 		 construct_line_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_MIDPOINT_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_MIDPOINT_2)
 CGAL_Kernel_cons(Construct_midpoint_2,
 		 construct_midpoint_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_MIDPOINT_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_MIDPOINT_3)
 CGAL_Kernel_cons(Construct_midpoint_3,
 		 construct_midpoint_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_OBJECT_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_OBJECT_2)
 CGAL_Kernel_cons(Construct_object_2,
                  construct_object_2_object)
 #endif
@@ -335,217 +374,260 @@ CGAL_Kernel_cons(Construct_object_3,
                  construct_object_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_OPPOSITE_CIRCLE_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_OPPOSITE_CIRCLE_2)
 CGAL_Kernel_cons(Construct_opposite_circle_2,
 		 construct_opposite_circle_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_OPPOSITE_DIRECTION_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_OPPOSITE_DIRECTION_2)
 CGAL_Kernel_cons(Construct_opposite_direction_2,
 		 construct_opposite_direction_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_OPPOSITE_DIRECION_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_OPPOSITE_DIRECION_3)
 CGAL_Kernel_cons(Construct_opposite_direction_3,
 		 construct_opposite_direction_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_OPPOSITE_LINE_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_OPPOSITE_LINE_2)
 CGAL_Kernel_cons(Construct_opposite_line_2,
 		 construct_opposite_line_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_OPPOSITE_LINE_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_OPPOSITE_LINE_3)
 CGAL_Kernel_cons(Construct_opposite_line_3,
 		 construct_opposite_line_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_OPPOSITE_PLANE_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_OPPOSITE_PLANE_3)
 CGAL_Kernel_cons(Construct_opposite_plane_3,
 		 construct_opposite_plane_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_OPPOSITE_RAY_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_OPPOSITE_RAY_2)
 CGAL_Kernel_cons(Construct_opposite_ray_2,
 		 construct_opposite_ray_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_OPPOSITE_RAY_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_OPPOSITE_RAY_3)
 CGAL_Kernel_cons(Construct_opposite_ray_3,
 		 construct_opposite_ray_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_OPPOSITE_SEGMENT_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_OPPOSITE_SEGMENT_2)
 CGAL_Kernel_cons(Construct_opposite_segment_2,
 		 construct_opposite_segment_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_OPPOSITE_SEGMENT_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_OPPOSITE_SEGMENT_3)
 CGAL_Kernel_cons(Construct_opposite_segment_3,
 		 construct_opposite_segment_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_OPPOSITE_SPHERE_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_OPPOSITE_SPHERE_3)
 CGAL_Kernel_cons(Construct_opposite_sphere_3,
 		 construct_opposite_sphere_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_OPPOSITE_TRIANGLE_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_OPPOSITE_TRIANGLE_2)
 CGAL_Kernel_cons(Construct_opposite_triangle_2,
 		 construct_opposite_triangle_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_OPPOSITE_VECTOR_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_OPPOSITE_VECTOR_2)
 CGAL_Kernel_cons(Construct_opposite_vector_2,
 		 construct_opposite_vector_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_OPPOSITE_VECTOR_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_OPPOSITE_VECTOR_3)
 CGAL_Kernel_cons(Construct_opposite_vector_3,
 		 construct_opposite_vector_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_ORTHOGONAL_VECTOR_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_ORTHOGONAL_VECTOR_3)
 CGAL_Kernel_cons(Construct_orthogonal_vector_3,
 		 construct_orthogonal_vector_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_PERPENDICULAR_DIRECTION_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_PERPENDICULAR_DIRECTION_2)
 CGAL_Kernel_cons(Construct_perpendicular_direction_2,
 		 construct_perpendicular_direction_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_PERPENDICULAR_LINE_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_PERPENDICULAR_LINE_2)
 CGAL_Kernel_cons(Construct_perpendicular_line_2,
 		 construct_perpendicular_line_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_PERPENDICULAR_LINE_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_PERPENDICULAR_LINE_3)
 CGAL_Kernel_cons(Construct_perpendicular_line_3,
 		 construct_perpendicular_line_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_PERPENDICULAR_PLANE_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_PERPENDICULAR_PLANE_3)
 CGAL_Kernel_cons(Construct_perpendicular_plane_3,
 		 construct_perpendicular_plane_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_PERPENDICULAR_VECTOR_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_PERPENDICULAR_VECTOR_2)
 CGAL_Kernel_cons(Construct_perpendicular_vector_2,
 		 construct_perpendicular_vector_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_PLANE_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_PLANE_3)
 CGAL_Kernel_cons(Construct_plane_3,
 		 construct_plane_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_POINT_ON_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_POINT_ON_2)
 CGAL_Kernel_cons(Construct_point_on_2,
 		 construct_point_on_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_POINT_ON_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_POINT_ON_3)
 CGAL_Kernel_cons(Construct_point_on_3,
 		 construct_point_on_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_POINT_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_POINT_2)
 CGAL_Kernel_cons(Construct_point_2,
 		 construct_point_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_POINT_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_POINT_3)
 CGAL_Kernel_cons(Construct_point_3,
 		 construct_point_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_PROJECTED_POINT_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_PROJECTED_POINT_2)
 CGAL_Kernel_cons(Construct_projected_point_2,
 		 construct_projected_point_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_PROJECTED_POINT_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_PROJECTED_POINT_3)
 CGAL_Kernel_cons(Construct_projected_point_3,
 		 construct_projected_point_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_PROJECTED_XY_POINT_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_PROJECTED_XY_POINT_2)
 CGAL_Kernel_cons(Construct_projected_xy_point_2,
 		 construct_projected_xy_point_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_RAY_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_RAY_2)
 CGAL_Kernel_cons(Construct_ray_2,
 		 construct_ray_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_RAY_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_RAY_3)
 CGAL_Kernel_cons(Construct_ray_3,
 		 construct_ray_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_SCALED_VECTOR_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_SCALED_VECTOR_2)
 CGAL_Kernel_cons(Construct_scaled_vector_2,
 		 construct_scaled_vector_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_SCALED_VECTOR_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_SCALED_VECTOR_3)
 CGAL_Kernel_cons(Construct_scaled_vector_3,
 		 construct_scaled_vector_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_SEGMENT_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_SEGMENT_2)
 CGAL_Kernel_cons(Construct_segment_2,
 		 construct_segment_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_SEGMENT_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_SEGMENT_3)
 CGAL_Kernel_cons(Construct_segment_3,
 		 construct_segment_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_SPHERE_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_SPHERE_3)
 CGAL_Kernel_cons(Construct_sphere_3,
 		 construct_sphere_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_SUPPORTING_LINE_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_SUPPORTING_LINE_2)
 CGAL_Kernel_cons(Construct_supporting_line_2,
 		 construct_supporting_line_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_SUPPORTING_LINE_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_SUPPORTING_LINE_3)
 CGAL_Kernel_cons(Construct_supporting_line_3,
 		 construct_supporting_line_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_SUPPORTING_PLANE_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_SUPPORTING_PLANE_3)
 CGAL_Kernel_cons(Construct_supporting_plane_3,
 		 construct_supporting_plane_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_TETRAHEDRON_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_TETRAHEDRON_3)
 CGAL_Kernel_cons(Construct_tetrahedron_3,
 		 construct_tetrahedron_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_TRANSLATED_POINT_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_TRANSLATED_POINT_2)
 CGAL_Kernel_cons(Construct_translated_point_2,
 		 construct_translated_point_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_TRANSLATED_POINT_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_TRANSLATED_POINT_3)
 CGAL_Kernel_cons(Construct_translated_point_3,
 		 construct_translated_point_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_TRIANGLE_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_TRIANGLE_2)
 CGAL_Kernel_cons(Construct_triangle_2,
 		 construct_triangle_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_CONSTRUCT_TRIANGLE_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_CONSTRUCT_TRIANGLE_3)
 CGAL_Kernel_cons(Construct_triangle_3,
 		 construct_triangle_3_object)
 #endif
@@ -570,12 +652,14 @@ CGAL_Kernel_cons(Construct_vertex_3,
 		 construct_vertex_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_COPLANAR_ORIENTATION_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_COPLANAR_ORIENTATION_3)
 CGAL_Kernel_pred(Coplanar_orientation_3,
 		 coplanar_orientation_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_COPLANAR_SIDE_OF_BOUNDED_CIRCLE_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_COPLANAR_SIDE_OF_BOUNDED_CIRCLE_3)
 CGAL_Kernel_pred(Coplanar_side_of_bounded_circle_3,
 		 coplanar_side_of_bounded_circle_3_object)
 #endif
@@ -585,17 +669,20 @@ CGAL_Kernel_pred(Coplanar_3,
 		 coplanar_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_COUNTERCLOCKWISE_IN_BETWEEN_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_COUNTERCLOCKWISE_IN_BETWEEN_2)
 CGAL_Kernel_pred(Counterclockwise_in_between_2,
 		 counterclockwise_in_between_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_DO_INTERSECT_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_DO_INTERSECT_2)
 CGAL_Kernel_pred(Do_intersect_2,
 		 do_intersect_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_DO_INTERSECT_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_DO_INTERSECT_3)
 CGAL_Kernel_cons(Do_intersect_3,
 		 do_intersect_3_object)
 #endif
@@ -650,42 +737,50 @@ CGAL_Kernel_pred(Has_on_boundary_3,
 		 has_on_boundary_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_HAS_ON_BOUNDED_SIDE_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_HAS_ON_BOUNDED_SIDE_2)
 CGAL_Kernel_pred(Has_on_bounded_side_2,
 		 has_on_bounded_side_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_HAS_ON_BOUNDED_SIDE_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_HAS_ON_BOUNDED_SIDE_3)
 CGAL_Kernel_pred(Has_on_bounded_side_3,
 		 has_on_bounded_side_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_HAS_ON_NEGATIVE_SIDE_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_HAS_ON_NEGATIVE_SIDE_2)
 CGAL_Kernel_pred(Has_on_negative_side_2,
 		 has_on_negative_side_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_HAS_ON_NEGATIVE_SIDE_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_HAS_ON_NEGATIVE_SIDE_3)
 CGAL_Kernel_pred(Has_on_negative_side_3,
 		 has_on_negative_side_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_HAS_ON_POSITIVE_SIDE_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_HAS_ON_POSITIVE_SIDE_2)
 CGAL_Kernel_pred(Has_on_positive_side_2,
 		 has_on_positive_side_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_HAS_ON_POSITIVE_SIDE_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_HAS_ON_POSITIVE_SIDE_3)
 CGAL_Kernel_pred(Has_on_positive_side_3,
 		 has_on_positive_side_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_HAS_ON_UNBOUNDED_SIDE_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_HAS_ON_UNBOUNDED_SIDE_2)
 CGAL_Kernel_pred(Has_on_unbounded_side_2,
 		 has_on_unbounded_side_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_HAS_ON_UNBOUNDED_SIDE_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_HAS_ON_UNBOUNDED_SIDE_3)
 CGAL_Kernel_pred(Has_on_unbounded_side_3,
 		 has_on_unbounded_side_3_object)
 #endif
@@ -735,27 +830,32 @@ CGAL_Kernel_pred(Left_turn_2,
                  left_turn_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_LESS_DISTANCE_TO_POINT_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_LESS_DISTANCE_TO_POINT_2)
 CGAL_Kernel_pred(Less_distance_to_point_2,
                  less_distance_to_point_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_LESS_DISTANCE_TO_POINT_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_LESS_DISTANCE_TO_POINT_3)
 CGAL_Kernel_pred(Less_distance_to_point_3,
                  less_distance_to_point_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_LESS_ROTATE_CCW_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_LESS_ROTATE_CCW_2)
 CGAL_Kernel_pred(Less_rotate_ccw_2,
 		 less_rotate_ccw_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_LESS_SIGNED_DISTANCE_TO_LINE_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_LESS_SIGNED_DISTANCE_TO_LINE_2)
 CGAL_Kernel_pred(Less_signed_distance_to_line_2,
                  less_signed_distance_to_line_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_LESS_SIGNED_DISTANCE_TO_PLANE_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_LESS_SIGNED_DISTANCE_TO_PLANE_3)
 CGAL_Kernel_pred(Less_signed_distance_to_plane_3,
 		 less_signed_distance_to_plane_3_object)
 #endif
@@ -825,27 +925,31 @@ CGAL_Kernel_pred(Oriented_side_3,
 		 oriented_side_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_SIDE_OF_BOUNDED_CIRCLE_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_SIDE_OF_BOUNDED_CIRCLE_2)
 CGAL_Kernel_pred(Side_of_bounded_circle_2,
 		 side_of_bounded_circle_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_SIDE_OF_BOUNDED_SPHERE_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_SIDE_OF_BOUNDED_SPHERE_3)
 CGAL_Kernel_pred(Side_of_bounded_sphere_3,
 		 side_of_bounded_sphere_3_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_SIDE_OF_ORIENTED_CIRCLE_2)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_SIDE_OF_ORIENTED_CIRCLE_2)
 CGAL_Kernel_pred(Side_of_oriented_circle_2,
 		 side_of_oriented_circle_2_object)
 #endif
 
-#if !defined(CGAL_CA_LIMITED_INTERFACE) || defined(CGAL_CA_SIDE_OF_ORIENTED_SPHERE_3)
+#if !defined(CGAL_CA_LIMITED_INTERFACE) || \
+    defined(CGAL_CA_SIDE_OF_ORIENTED_SPHERE_3)
 CGAL_Kernel_pred(Side_of_oriented_sphere_3,
 		 side_of_oriented_sphere_3_object)
 #endif
 
-// deprecated functors removed ...
+// deprecated functors were removed ...
 
 #undef CGAL_Kernel_pred
 #undef CGAL_Kernel_cons