From 65fca7d247eaec7bd20c19335e28a23d9a4a8ad4 Mon Sep 17 00:00:00 2001
From: Ophir Setter <ophirset@post.tau.ac.il>
Date: Fri, 3 Oct 2008 14:31:44 +0000
Subject: [PATCH] change in circular kernel

---
 .../include/CGAL/Arr_circular_arc_traits_2.h  |  2 +-
 .../include/CGAL/Arr_line_arc_traits_2.h      |  3 +-
 .../Traits_base_test.h                        | 57 ++++++++++---------
 3 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_circular_arc_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_circular_arc_traits_2.h
index 12ccbb1dc50..15e889c0f18 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_circular_arc_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_circular_arc_traits_2.h
@@ -33,7 +33,7 @@
  */
 
 #include <CGAL/basic.h>
-#include <CGAL/global_functions_on_circular_arcs_2.h>
+#include <CGAL/global_functions_circular_kernel_2.h>
 #include <CGAL/Arr_tags.h>
 
 namespace CGAL {
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_line_arc_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_line_arc_traits_2.h
index c93dc791f39..3c659300326 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_line_arc_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_line_arc_traits_2.h
@@ -35,8 +35,7 @@
 #include <CGAL/basic.h>
 #include <CGAL/tags.h>
 #include <CGAL/Arr_tags.h>
-#include <CGAL/global_functions_on_circular_arcs_2.h>
-#include <CGAL/global_functions_on_line_arcs_2.h>
+#include <CGAL/global_functions_circular_kernel_2.h>
 
 
 
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Traits_base_test.h b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Traits_base_test.h
index 31548d80499..a4991e9d8ba 100644
--- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Traits_base_test.h
+++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Traits_base_test.h
@@ -1645,35 +1645,38 @@ Circular_kernel::Circular_arc_2 read_arc(char type,stream & is)
 {
   if (type == 'b' || type == 'B')
   {
-    Circular_kernel::Circle_2 c_temp,c_temp1,c_temp2;
-    bool b1,b2;
-    is >> c_temp >> c_temp1 >> b1 >> c_temp2 >> b2 ;
-    return Circular_kernel::Circular_arc_2(c_temp,c_temp1,b1,c_temp2,b2);
+    Circular_kernel::Circle_2 circle, circle1, circle2;
+    bool b1, b2;
+    is >> circle >> circle1 >> b1 >> circle2 >> b2;
+
+    return Circular_kernel::Circular_arc_2(circle, circle1, b1, circle2, b2);
   }
   else if (type == 'c' || type == 'C')
   {
-    Circular_kernel::Circle_2 c_temp;
-    Circular_kernel::Circular_arc_point_2 p0,p1;
-    is >> c_temp >> p0 >> p1;
-    return Circular_kernel::Circular_arc_2(c_temp,p0,p1);
+    Circular_kernel::Circle_2 circle;
+    Circular_kernel::Circular_arc_point_2 p0, p1;
+    is >> circle >> p0 >> p1;
+    return Circular_kernel::Circular_arc_2(circle, p0, p1);
   }
   else if (type == 'd' || type == 'D')
   {
-    Circular_kernel::Circle_2 c_temp;
-    Circular_kernel::Line_2 l_temp1,l_temp2;
+    Circular_kernel::Circle_2 circle;
+    Circular_kernel::Line_2 line1, line2;
     bool b1,b2;
-    is >> c_temp >> l_temp1 >> b1 >> l_temp2 >> b2;
-    return Circular_kernel::Circular_arc_2(c_temp,l_temp1,b1,l_temp2,b2);
+    is >> circle >> line1 >> b1 >> line2 >> b2;
+    return Circular_kernel::Circular_arc_2(circle, line1, b1, line2, b2);
   }
-  else if (type == 'e' || type == 'E')
-  {
-    Circular_kernel::Circular_arc_2 a_temp;
-    Circular_kernel::Circle_2 c_temp;
-    bool b1,b2;
-    is >> a_temp >> b1 >> c_temp >> b2;
-    return Circular_kernel::Circular_arc_2(a_temp,b1,c_temp,b2);
-  }
-  std::cout << "should never happen Circular_arc_2" << std::endl;
+  else
+    CGAL_error_msg("Unrecognized constructor. Should never happen"      \
+                   "Circular_arc_2");
+  //  else if (type == 'e' || type == 'E')
+  //  {
+  //    Circular_kernel::Circular_arc_2 arc;
+  //    Circular_kernel::Circle_2 circle;
+  //    bool b1, b2;
+  //    is >> arc >> b1 >> circle >> b2;
+  //    return Circular_kernel::Circular_arc_2(arc, b1, circle, b2);
+  //  }
   return Circular_kernel::Circular_arc_2(); //should never happen
 }
 #endif
@@ -1763,9 +1766,9 @@ Traits_base_test<Traits>::read_curve(stream & is, Curve_2 & cv)
   is >> type;
   if (type == 'a' || type == 'A') 
   {
-    Circular_kernel::Circle_2 c_temp;
-    is >> c_temp;
-    cv=Circular_kernel::Circular_arc_2(c_temp);
+    Circular_kernel::Circle_2 circle;
+    is >> circle;
+    cv=Circular_kernel::Circular_arc_2(circle);
     return true;
   }
   else if (is_deg_2(type))
@@ -1816,9 +1819,9 @@ bool Traits_base_test<Traits>::read_curve(stream & is, Curve_2 & cv)
   char type;
   is >> type;
   if (type == 'a' || type == 'A') {
-    Circular_kernel::Circle_2 c_temp;
-    is >> c_temp;
-    cv=Curve_2(c_temp);
+    Circular_kernel::Circle_2 circle;
+    is >> circle;
+    cv=Curve_2(circle);
     return true;
   }
   else if (is_deg_1(type)) {