From 5ff54985582c3eead2c83e8cba05406082a9ad6d Mon Sep 17 00:00:00 2001 From: Pedro Machado Manhaes de Castro Date: Fri, 25 Aug 2006 09:02:22 +0000 Subject: [PATCH] Algebraic_kernel_for_circles (instead of Algebraic_kernel) --- .../include/CGAL/Algebraic_kernel_converter.h | 6 +++--- .../function_objects_on_roots_and_polynomials_2_2.h | 12 ++++++------ ...ernal_functions_comparison_root_for_circles_2_2.h | 6 +++--- ...l_functions_on_roots_and_polynomial_1_2_and_2_2.h | 6 +++--- ...internal_functions_on_roots_and_polynomials_2_2.h | 6 +++--- .../include/CGAL/Polynomials_1_2.h | 6 +++--- .../include/CGAL/Polynomials_2_2.h | 6 +++--- .../include/CGAL/Root_for_circles_2_2.h | 6 +++--- .../CGAL/global_functions_on_root_for_circle_2_2.h | 6 +++--- ...l_functions_on_roots_and_polynomial_1_2_and_2_2.h | 6 +++--- .../global_functions_on_roots_and_polynomials_2_2.h | 6 +++--- 11 files changed, 36 insertions(+), 36 deletions(-) diff --git a/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_converter.h b/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_converter.h index db5a062fcfd..c4b466287d0 100644 --- a/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_converter.h +++ b/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_converter.h @@ -22,8 +22,8 @@ // and a STREP (FET Open) Project under Contract No IST-006413 // (ACS -- Algorithms for Complex Shapes) -#ifndef CGAL_ALGEBRAIC_KERNEL_CONVERTER_H -#define CGAL_ALGEBRAIC_KERNEL_CONVERTER_H +#ifndef CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_CONVERTER_H +#define CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_CONVERTER_H #include @@ -63,4 +63,4 @@ public: CGAL_END_NAMESPACE -#endif // CGAL_ALGEBRAIC_KERNEL_CONVERTER_H +#endif // CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_CONVERTER_H diff --git a/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles/function_objects_on_roots_and_polynomials_2_2.h b/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles/function_objects_on_roots_and_polynomials_2_2.h index f8912c00f4d..43be142e93a 100644 --- a/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles/function_objects_on_roots_and_polynomials_2_2.h +++ b/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles/function_objects_on_roots_and_polynomials_2_2.h @@ -22,12 +22,12 @@ // and a STREP (FET Open) Project under Contract No IST-006413 // (ACS -- Algorithms for Complex Shapes) -#ifndef CGAL_ALGEBRAIC_KERNEL_FUNCTION_OBJECTS_ON_ROOTS_AND_POLYNOMIALS_2_H -#define CGAL_ALGEBRAIC_KERNEL_FUNCTION_OBJECTS_ON_ROOTS_AND_POLYNOMIALS_2_H +#ifndef CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_FUNCTION_OBJECTS_ON_ROOTS_AND_POLYNOMIALS_2_H +#define CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_FUNCTION_OBJECTS_ON_ROOTS_AND_POLYNOMIALS_2_H -#include -#include -#include +#include +#include +#include CGAL_BEGIN_NAMESPACE @@ -232,4 +232,4 @@ namespace AlgebraicFunctors { CGAL_END_NAMESPACE -#endif // CGAL_ALGEBRAIC_KERNEL_FUNCTION_OBJECTS_ON_ROOTS_AND_POLYNOMIALS_2_H +#endif // CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_FUNCTION_OBJECTS_ON_ROOTS_AND_POLYNOMIALS_2_H diff --git a/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles/internal_functions_comparison_root_for_circles_2_2.h b/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles/internal_functions_comparison_root_for_circles_2_2.h index bc40d39e868..6fb2a04bc13 100644 --- a/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles/internal_functions_comparison_root_for_circles_2_2.h +++ b/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles/internal_functions_comparison_root_for_circles_2_2.h @@ -22,8 +22,8 @@ // and a STREP (FET Open) Project under Contract No IST-006413 // (ACS -- Algorithms for Complex Shapes) -#ifndef CGAL_ALGEBRAIC_KERNEL_COMPARISON_ROOT_FOR_CIRCLES_2_2_H -#define CGAL_ALGEBRAIC_KERNEL_COMPARISON_ROOT_FOR_CIRCLES_2_2_H +#ifndef CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_COMPARISON_ROOT_FOR_CIRCLES_2_2_H +#define CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_COMPARISON_ROOT_FOR_CIRCLES_2_2_H namespace CGAL { @@ -53,4 +53,4 @@ namespace CGAL { } // namespace AlgebraicFunctors } // namespace CGAL -#endif // CGAL_ALGEBRAIC_KERNEL_COMPARISON_ROOT_FOR_CIRCLES_2_2_H +#endif // CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_COMPARISON_ROOT_FOR_CIRCLES_2_2_H diff --git a/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles/internal_functions_on_roots_and_polynomial_1_2_and_2_2.h b/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles/internal_functions_on_roots_and_polynomial_1_2_and_2_2.h index 7547e6975c2..9192a21f950 100644 --- a/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles/internal_functions_on_roots_and_polynomial_1_2_and_2_2.h +++ b/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles/internal_functions_on_roots_and_polynomial_1_2_and_2_2.h @@ -22,8 +22,8 @@ // and a STREP (FET Open) Project under Contract No IST-006413 // (ACS -- Algorithms for Complex Shapes) -#ifndef CGAL_ALGEBRAIC_KERNEL_FUNCTIONS_ON_ROOTS_AND_POLYNOMIAL_1_2_AND_2_2_H -#define CGAL_ALGEBRAIC_KERNEL_FUNCTIONS_ON_ROOTS_AND_POLYNOMIAL_1_2_AND_2_2_H +#ifndef CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_FUNCTIONS_ON_ROOTS_AND_POLYNOMIAL_1_2_AND_2_2_H +#define CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_FUNCTIONS_ON_ROOTS_AND_POLYNOMIAL_1_2_AND_2_2_H namespace CGAL { @@ -186,4 +186,4 @@ namespace CGAL { } // namespace AlgebraicFunctors } // namespace CGAL -#endif // CGAL_ALGEBRAIC_KERNEL_FUNCTIONS_ON_ROOTS_AND_POLYNOMIAL1_2_AND_2_2_H +#endif // CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_FUNCTIONS_ON_ROOTS_AND_POLYNOMIAL_1_2_AND_2_2_H diff --git a/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles/internal_functions_on_roots_and_polynomials_2_2.h b/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles/internal_functions_on_roots_and_polynomials_2_2.h index 5897d946196..9c2d973a4c2 100644 --- a/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles/internal_functions_on_roots_and_polynomials_2_2.h +++ b/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles/internal_functions_on_roots_and_polynomials_2_2.h @@ -22,8 +22,8 @@ // and a STREP (FET Open) Project under Contract No IST-006413 // (ACS -- Algorithms for Complex Shapes) -#ifndef CGAL_ALGEBRAIC_KERNEL_FUNCTIONS_ON_ROOTS_AND_POLYNOMIALS_2_H -#define CGAL_ALGEBRAIC_KERNEL_FUNCTIONS_ON_ROOTS_AND_POLYNOMIALS_2_H +#ifndef CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_FUNCTIONS_ON_ROOTS_AND_POLYNOMIALS_2_H +#define CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_FUNCTIONS_ON_ROOTS_AND_POLYNOMIALS_2_H namespace CGAL { namespace AlgebraicFunctors { @@ -230,5 +230,5 @@ namespace CGAL { } // namespace AlgebraicFunctors } // namespace CGAL -#endif // CGAL_ALGEBRAIC_KERNEL_FUNCTIONS_ON_ROOTS_AND_POLYNOMIALS_2_H +#endif // CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_FUNCTIONS_ON_ROOTS_AND_POLYNOMIALS_2_H diff --git a/Algebraic_kernel_for_circles/include/CGAL/Polynomials_1_2.h b/Algebraic_kernel_for_circles/include/CGAL/Polynomials_1_2.h index 9c89c678a97..3ec04a3598a 100644 --- a/Algebraic_kernel_for_circles/include/CGAL/Polynomials_1_2.h +++ b/Algebraic_kernel_for_circles/include/CGAL/Polynomials_1_2.h @@ -22,8 +22,8 @@ // and a STREP (FET Open) Project under Contract No IST-006413 // (ACS -- Algorithms for Complex Shapes) -#ifndef CGAL_ALGEBRAIC_KERNEL_POLYNOMIALS_1_2_H -#define CGAL_ALGEBRAIC_KERNEL_POLYNOMIALS_1_2_H +#ifndef CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_POLYNOMIALS_1_2_H +#define CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_POLYNOMIALS_1_2_H #include @@ -69,4 +69,4 @@ operator == ( const Polynomial_1_2 & p1, CGAL_END_NAMESPACE -#endif //CGAL_ALGEBRAIC_KERNEL_POLYNOMIALS_1_2_H +#endif //CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_POLYNOMIALS_1_2_H diff --git a/Algebraic_kernel_for_circles/include/CGAL/Polynomials_2_2.h b/Algebraic_kernel_for_circles/include/CGAL/Polynomials_2_2.h index 850e7bab2a7..54dd268e1f7 100644 --- a/Algebraic_kernel_for_circles/include/CGAL/Polynomials_2_2.h +++ b/Algebraic_kernel_for_circles/include/CGAL/Polynomials_2_2.h @@ -22,8 +22,8 @@ // and a STREP (FET Open) Project under Contract No IST-006413 // (ACS -- Algorithms for Complex Shapes) -#ifndef CGAL_ALGEBRAIC_KERNEL_POLYNOMIALS_2_2_H -#define CGAL_ALGEBRAIC_KERNEL_POLYNOMIALS_2_2_H +#ifndef CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_POLYNOMIALS_2_2_H +#define CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_POLYNOMIALS_2_2_H //////////// FIXME - pb RT (cas general Polynomial_2_2) ou FT (ici) @@ -72,4 +72,4 @@ operator == ( const Polynomial_for_circles_2_2 & p1, CGAL_END_NAMESPACE -#endif //CGAL_ALGEBRAIC_KERNEL_POLYNOMIALS_2_2_H +#endif //CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_POLYNOMIALS_2_2_H diff --git a/Algebraic_kernel_for_circles/include/CGAL/Root_for_circles_2_2.h b/Algebraic_kernel_for_circles/include/CGAL/Root_for_circles_2_2.h index 28ba3631c44..600c41b1e0d 100644 --- a/Algebraic_kernel_for_circles/include/CGAL/Root_for_circles_2_2.h +++ b/Algebraic_kernel_for_circles/include/CGAL/Root_for_circles_2_2.h @@ -22,8 +22,8 @@ // and a STREP (FET Open) Project under Contract No IST-006413 // (ACS -- Algorithms for Complex Shapes) -#ifndef CGAL_ROOT_FOR_CIRCLES_2_2_H -#define CGAL_ROOT_FOR_CIRCLES_2_2_H +#ifndef CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_ROOT_FOR_CIRCLES_2_2_H +#define CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_ROOT_FOR_CIRCLES_2_2_H #include #include @@ -132,4 +132,4 @@ operator>>(std::istream & is, Root_for_circles_2_2 &r) CGAL_END_NAMESPACE -#endif // CGAL_ROOT_FOR_CIRCLES_2_2_H +#endif // CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_ROOT_FOR_CIRCLES_2_2_H diff --git a/Algebraic_kernel_for_circles/include/CGAL/global_functions_on_root_for_circle_2_2.h b/Algebraic_kernel_for_circles/include/CGAL/global_functions_on_root_for_circle_2_2.h index 18730a41de9..302d5e3b135 100644 --- a/Algebraic_kernel_for_circles/include/CGAL/global_functions_on_root_for_circle_2_2.h +++ b/Algebraic_kernel_for_circles/include/CGAL/global_functions_on_root_for_circle_2_2.h @@ -22,8 +22,8 @@ // and a STREP (FET Open) Project under Contract No IST-006413 // (ACS -- Algorithms for Complex Shapes) -#ifndef CGAL_ALGEBRAIC_KERNEL_GLOBAL_FUNCTIONS_ON_ROOT_FOR_CIRCLE_2_2_H -#define CGAL_ALGEBRAIC_KERNEL_GLOBAL_FUNCTIONS_ON_ROOT_FOR_CIRCLE_2_2_H +#ifndef CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_GLOBAL_FUNCTIONS_ON_ROOT_FOR_CIRCLE_2_2_H +#define CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_GLOBAL_FUNCTIONS_ON_ROOT_FOR_CIRCLE_2_2_H CGAL_BEGIN_NAMESPACE @@ -50,4 +50,4 @@ compare_xy(const typename AK::Root_for_circles_2_2& r1, CGAL_END_NAMESPACE -#endif //CGAL_ALGEBRAIC_KERNEL_GLOBAL_FUNCTIONS_ON_ROOT_FOR_CIRCLE_2_2_H +#endif //CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_GLOBAL_FUNCTIONS_ON_ROOT_FOR_CIRCLE_2_2_H diff --git a/Algebraic_kernel_for_circles/include/CGAL/global_functions_on_roots_and_polynomial_1_2_and_2_2.h b/Algebraic_kernel_for_circles/include/CGAL/global_functions_on_roots_and_polynomial_1_2_and_2_2.h index 9e26dc00f14..fa82ef1004d 100644 --- a/Algebraic_kernel_for_circles/include/CGAL/global_functions_on_roots_and_polynomial_1_2_and_2_2.h +++ b/Algebraic_kernel_for_circles/include/CGAL/global_functions_on_roots_and_polynomial_1_2_and_2_2.h @@ -22,8 +22,8 @@ // and a STREP (FET Open) Project under Contract No IST-006413 // (ACS -- Algorithms for Complex Shapes) -#ifndef CGAL_CURVED_KERNEL_GLOBAL_FUNCTIONS_ON_ROOTS_AND_POLYNOMIAL_1_2_AND_2_2_H -#define CGAL_CURVED_KERNEL_GLOBAL_FUNCTIONS_ON_ROOTS_AND_POLYNOMIAL_1_2_AND_2_2_H +#ifndef CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_GLOBAL_FUNCTIONS_ON_ROOTS_AND_POLYNOMIAL_1_2_AND_2_2_H +#define CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_GLOBAL_FUNCTIONS_ON_ROOTS_AND_POLYNOMIAL_1_2_AND_2_2_H CGAL_BEGIN_NAMESPACE @@ -59,4 +59,4 @@ construct_polynomial_1_2( const typename AK::RT& a, CGAL_END_NAMESPACE -#endif // CGAL_CURVED_KERNEL_GLOBAL_FUNCTIONS_ON_ROOTS_AND_POLYNOMIAL_1_2_AND_2_2_H +#endif // CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_GLOBAL_FUNCTIONS_ON_ROOTS_AND_POLYNOMIAL_1_2_AND_2_2_H diff --git a/Algebraic_kernel_for_circles/include/CGAL/global_functions_on_roots_and_polynomials_2_2.h b/Algebraic_kernel_for_circles/include/CGAL/global_functions_on_roots_and_polynomials_2_2.h index 00728aad410..c8adf57925d 100644 --- a/Algebraic_kernel_for_circles/include/CGAL/global_functions_on_roots_and_polynomials_2_2.h +++ b/Algebraic_kernel_for_circles/include/CGAL/global_functions_on_roots_and_polynomials_2_2.h @@ -22,8 +22,8 @@ // and a STREP (FET Open) Project under Contract No IST-006413 // (ACS -- Algorithms for Complex Shapes) -#ifndef CGAL_CURVED_KERNEL_GLOBAL_FUNCTIONS_ON_ROOTS_AND_POLYNOMIALS_2_2_H -#define CGAL_CURVED_KERNEL_GLOBAL_FUNCTIONS_ON_ROOTS_AND_POLYNOMIALS_2_2_H +#ifndef CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_GLOBAL_FUNCTIONS_ON_ROOTS_AND_POLYNOMIALS_2_2_H +#define CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_GLOBAL_FUNCTIONS_ON_ROOTS_AND_POLYNOMIALS_2_2_H CGAL_BEGIN_NAMESPACE @@ -73,4 +73,4 @@ y_critical_points(const typename AK::Polynomial_for_circles_2_2 & c, CGAL_END_NAMESPACE -#endif // CGAL_CURVED_KERNEL_GLOBAL_FUNCTIONS_ON_ROOTS_AND_POLYNOMIALS_2_2_H +#endif // CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_GLOBAL_FUNCTIONS_ON_ROOTS_AND_POLYNOMIALS_2_2_H