From 48dfd13c03e045ee36b811e18f9ea9424b2e630f Mon Sep 17 00:00:00 2001
From: Michael Kerber <mkerber@mpi-inf.mpg.de>
Date: Wed, 13 Aug 2008 12:23:47 +0000
Subject: [PATCH] Renamed macro, and moved file to Algebraic_kernel_d
 subdirectory

---
 .gitattributes                                              | 2 +-
 .../Algebraic_curve_kernel_2/analyses/Curve_analysis_2.h    | 6 +++---
 .../analyses/Shear_transformation.h                         | 4 ++--
 .../analyses => Algebraic_kernel_d}/macros.h                | 0
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename Algebraic_kernel_d/include/CGAL/{Algebraic_curve_kernel_2/analyses => Algebraic_kernel_d}/macros.h (100%)

diff --git a/.gitattributes b/.gitattributes
index 5c781cd4442..ccd93e54f69 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -275,7 +275,6 @@ Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/analyses/Curve_pair_ana
 Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/analyses/Event_line_builder.h -text
 Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/analyses/Shear_controller.h -text
 Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/analyses/Shear_transformation.h -text
-Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/analyses/macros.h -text
 Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/analyses/shear.h -text
 Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/enums.h -text
 Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/flags.h -text
@@ -296,6 +295,7 @@ Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Integer_iterator.h -text
 Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Real_embeddable_extension.h -text
 Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Real_roots.h -text
 Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/construct_binary.h -text
+Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/macros.h -text
 Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/refine_zero_against.h -text
 Algebraic_kernel_d/include/CGAL/Filtered_algebraic_curve_kernel_2.h -text
 Algebraic_kernel_d/include/CGAL/Preferred_algebraic_curve_kernels_2.h -text
diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/analyses/Curve_analysis_2.h b/Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/analyses/Curve_analysis_2.h
index e0459d23c6d..3883532c7d4 100644
--- a/Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/analyses/Curve_analysis_2.h
+++ b/Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/analyses/Curve_analysis_2.h
@@ -32,7 +32,7 @@
 
 #include <CGAL/Polynomial_traits_d.h>
 
-#include <CGAL/Algebraic_curve_kernel_2/analyses/macros.h>
+#include <CGAL/Algebraic_kernel_d/macros.h>
 
 #include <CGAL/Algebraic_curve_kernel_2/Status_line_CA_1.h>
 #include <CGAL/Algebraic_curve_kernel_2/analyses/Event_line_builder.h>
@@ -76,7 +76,7 @@ public:
     
     typedef Handle Curve_analysis_2;
 
-    CGAL_ACK_SNAP_ALGEBRAIC_CURVE_TYPEDEFS;
+    CGAL_ACK_SNAP_ALGEBRAIC_CURVE_KERNEL_2_TYPEDEFS;
 
     typedef std::map< Boundary, Status_line_1 > 
     Vert_line_at_rational_map;
@@ -272,7 +272,7 @@ public:
     //! Indexing type
     typedef typename Rep::size_type size_type;
     
-    CGAL_ACK_SNAP_ALGEBRAIC_CURVE_TYPEDEFS;
+    CGAL_ACK_SNAP_ALGEBRAIC_CURVE_KERNEL_2_TYPEDEFS;
 
     //! Required by the CurveKernel_2 concept
     typedef Algebraic_real_1 X_coordinate_1;
diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/analyses/Shear_transformation.h b/Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/analyses/Shear_transformation.h
index 9dae7af71ce..fc219b5767f 100644
--- a/Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/analyses/Shear_transformation.h
+++ b/Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/analyses/Shear_transformation.h
@@ -18,7 +18,7 @@
 
 #include <vector>
 
-#include <CGAL/Algebraic_curve_kernel_2/analyses/macros.h>
+#include <CGAL/Algebraic_kernel_d/macros.h>
 #include <CGAL/Algebraic_kernel_d/Bitstream_descartes.h>
 #include <CGAL/Algebraic_kernel_d/Bitstream_descartes_rndl_tree_traits.h>
 #include <CGAL/Algebraic_curve_kernel_2/Bitstream_coefficient_kernel_at_alpha.h>
@@ -41,7 +41,7 @@ public:
 
     typedef typename Curve_analysis_2::Polynomial_traits_2 Polynomial_traits_2;
 
-    CGAL_ACK_SNAP_ALGEBRAIC_CURVE_TYPEDEFS;
+    CGAL_ACK_SNAP_ALGEBRAIC_CURVE_KERNEL_2_TYPEDEFS;
 
     typedef std::pair<Boundary,Boundary> Point;
 
diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/analyses/macros.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/macros.h
similarity index 100%
rename from Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/analyses/macros.h
rename to Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/macros.h