- Fixed a few buggy #includes

- Use the macro CGAL_ADVANCED_KERNEL_PARTIAL_SPEC. - remove warning CGAL::sign -> CGAL_NTS.
2001-06-20 21:55:05 +00:00 · 2001-06-20 21:55:05 +00:00 · a35291a8ba
parent 2febe5542f
commit a35291a8ba
20 changed files with 32 additions and 97 deletions
--- a/Old_Packages/Cd/changes.txt
+++ b/Old_Packages/Cd/changes.txt
@ -1,3 +1,8 @@
+Ver 1.13 (20 June 2001)
+- Fixed a few buggy #includes
+- Use the macro CGAL_ADVANCED_KERNEL_PARTIAL_SPEC.
+- remove warning CGAL::sign -> CGAL_NTS.
+
 Ver 1.12 (18 June 2001)
 - Remove references to VECTOR_WRAPPER.

--- a/Old_Packages/Cd/include/CGAL/Cartesian/Aff_transformation_d.h
+++ b/Old_Packages/Cd/include/CGAL/Cartesian/Aff_transformation_d.h
@ -47,11 +47,7 @@ CGAL_END_NAMESPACE
 CGAL_BEGIN_NAMESPACE

 template < class R_ >
-class Aff_transformationCd
-#ifndef CGAL_CFG_NO_ADVANCED_KERNEL
-// This is a partial specialization
-<R_,Cartesian_tag>
-#endif
+class Aff_transformationCd CGAL_ADVANCED_KERNEL_PARTIAL_SPEC
  : public Handle
 {
  friend class PlaneCd<R_ CGAL_CTAG>;
--- a/Old_Packages/Cd/include/CGAL/Cartesian/Direction_d.h
+++ b/Old_Packages/Cd/include/CGAL/Cartesian/Direction_d.h
@ -30,11 +30,7 @@
 CGAL_BEGIN_NAMESPACE

 template < class R_ >
-class DirectionCd
-#ifndef CGAL_CFG_NO_ADVANCED_KERNEL
-// This is a partial specialization
-<R_,Cartesian_tag>
-#endif
+class DirectionCd CGAL_ADVANCED_KERNEL_PARTIAL_SPEC
  : public Handle
 {
 public:
--- a/Old_Packages/Cd/include/CGAL/Cartesian/Homothecy_rep_d.h
+++ b/Old_Packages/Cd/include/CGAL/Cartesian/Homothecy_rep_d.h
@ -19,19 +19,13 @@
 //
 // ======================================================================

-#ifndef CGAL_CARTESIAN_REDEFINE_NAMES_D_H
-#define CGAL_CTAG
-#endif
-
-#ifdef _MSC_VER
-#define typename
-#endif
-
 #ifndef CGAL_CARTESIAN_HOMOTHECY_REP_D_H
 #define CGAL_CARTESIAN_HOMOTHECY_REP_D_H

-#ifndef CGAL_CARTESIAN_REDEFINE_NAMES_D_H
 #include <CGAL/Cartesian/redefine_names_d.h>
+
+#ifdef _MSC_VER
+#define typename
 #endif

 CGAL_BEGIN_NAMESPACE
--- a/Old_Packages/Cd/include/CGAL/Cartesian/Line_d.h
+++ b/Old_Packages/Cd/include/CGAL/Cartesian/Line_d.h
@ -22,20 +22,13 @@
 #ifndef CGAL_CARTESIAN_LINE_D_H
 #define CGAL_CARTESIAN_LINE_D_H

-#ifndef CGAL_CARTESIAN_REDEFINE_NAMES_D_H
 #include <CGAL/Cartesian/redefine_names_d.h>
-#endif
-
 #include <CGAL/Twotuple.h>

 CGAL_BEGIN_NAMESPACE

 template < class R_ >
-class LineCd
-#ifndef CGAL_CFG_NO_ADVANCED_KERNEL
-// This is a partial specialization
-<R_,Cartesian_tag>
-#endif
+class LineCd CGAL_ADVANCED_KERNEL_PARTIAL_SPEC
  : public Handle
 {
 public:
@ -101,9 +94,7 @@ private:
 CGAL_END_NAMESPACE

 #ifndef CGAL_CARTESIAN_CLASS_DEFINED
-#ifndef CGAL_CARTESIAN_LINE_D_C
 #include <CGAL/Cartesian/Line_d.C>
-#endif // CGAL_CARTESIAN_LINE_D_C
 #endif 

 #endif // CGAL_CARTESIAN_LINE_D_H
--- a/Old_Packages/Cd/include/CGAL/Cartesian/Linear_algebra_d.h
+++ b/Old_Packages/Cd/include/CGAL/Cartesian/Linear_algebra_d.h
@ -22,9 +22,9 @@
 #ifndef CGAL_CARTESIAN_LINEAR_ALGEBRA_D_H
 #define CGAL_CARTESIAN_LINEAR_ALGEBRA_D_H

+#include <CGAL/Cartesian/redefine_names_d.h>
 #include <memory>
 #include <vector>
-#include <CGAL/Cartesian/redefine_names_d.h>
 #include <CGAL/Cartesian/Linear_algebra_vector.h>
 #include <CGAL/Cartesian/Linear_algebra_matrix.h>

--- a/Old_Packages/Cd/include/CGAL/Cartesian/Plane_d.h
+++ b/Old_Packages/Cd/include/CGAL/Cartesian/Plane_d.h
@ -32,11 +32,7 @@
 CGAL_BEGIN_NAMESPACE

 template <class R_>
-class PlaneCd
-#ifndef CGAL_CFG_NO_ADVANCED_KERNEL
-// This is a partial specialization
-<R_,Cartesian_tag>
-#endif
+class PlaneCd CGAL_ADVANCED_KERNEL_PARTIAL_SPEC
  : public Handle
 {
 public:
--- a/Old_Packages/Cd/include/CGAL/Cartesian/Ray_d.h
+++ b/Old_Packages/Cd/include/CGAL/Cartesian/Ray_d.h
@ -28,11 +28,7 @@
 CGAL_BEGIN_NAMESPACE

 template < class R_ >
-class RayCd
-#ifndef CGAL_CFG_NO_ADVANCED_KERNEL
-// This is a partial specialization
-<R_,Cartesian_tag>
-#endif
+class RayCd CGAL_ADVANCED_KERNEL_PARTIAL_SPEC
  : public Handle
 {
 public:
--- a/Old_Packages/Cd/include/CGAL/Cartesian/Scaling_rep_d.h
+++ b/Old_Packages/Cd/include/CGAL/Cartesian/Scaling_rep_d.h
@ -19,19 +19,13 @@
 //
 // ======================================================================

-#ifndef CGAL_CARTESIAN_REDEFINE_NAMES_D_H
-#define CGAL_CTAG
-#endif
-
-#ifdef _MSC_VER
-#define typename
-#endif
-
 #ifndef CGAL_CARTESIAN_SCALING_REP_D_H
 #define CGAL_CARTESIAN_SCALING_REP_D_H

-#ifndef CGAL_CARTESIAN_REDEFINE_NAMES_D_H
 #include <CGAL/Cartesian/redefine_names_d.h>
+
+#ifdef _MSC_VER
+#define typename
 #endif

 CGAL_BEGIN_NAMESPACE
--- a/Old_Packages/Cd/include/CGAL/Cartesian/Segment_d.h
+++ b/Old_Packages/Cd/include/CGAL/Cartesian/Segment_d.h
@ -28,11 +28,7 @@
 CGAL_BEGIN_NAMESPACE

 template < class R_ >
-class SegmentCd
-#ifndef CGAL_CFG_NO_ADVANCED_KERNEL
-// This is a partial specialization
-<R_,Cartesian_tag>
-#endif
+class SegmentCd CGAL_ADVANCED_KERNEL_PARTIAL_SPEC
  : public Handle
 {
 public:
--- a/Old_Packages/Cd/include/CGAL/Cartesian/Simplex_d.h
+++ b/Old_Packages/Cd/include/CGAL/Cartesian/Simplex_d.h
@ -28,11 +28,7 @@
 CGAL_BEGIN_NAMESPACE

 template <class R_>
-class SimplexCd
-#ifndef CGAL_CFG_NO_ADVANCED_KERNEL
-// This is a partial specialization
-<R_,Cartesian_tag>
-#endif
+class SimplexCd CGAL_ADVANCED_KERNEL_PARTIAL_SPEC
  : public Handle
 {
 public:
--- a/Old_Packages/Cd/include/CGAL/Cartesian/Sphere_d.h
+++ b/Old_Packages/Cd/include/CGAL/Cartesian/Sphere_d.h
@ -23,21 +23,13 @@
 #ifndef CGAL_CARTESIAN_SPHERE_D_H
 #define CGAL_CARTESIAN_SPHERE_D_H

-#ifndef CGAL_CARTESIAN_REDEFINE_NAMES_D_H
 #include <CGAL/Cartesian/redefine_names_d.h>
-#endif
-#ifndef CGAL_CARTESIAN_SPHERE_REP_D_H
 #include <CGAL/Cartesian/Sphere_rep_d.h>
-#endif // CGAL_CARTESIAN_SPHERE_REP_D_H

 CGAL_BEGIN_NAMESPACE

 template <class R_>
-class SphereC3
-#ifndef CGAL_CFG_NO_ADVANCED_KERNEL
-// This is a partial specialization
-<R_,Cartesian_tag>
-#endif
+class SphereC3 CGAL_ADVANCED_KERNEL_PARTIAL_SPEC
 {
 public:
  typedef R_                                    R;
--- a/Old_Packages/Cd/include/CGAL/Cartesian/Tetrahedron_d.h
+++ b/Old_Packages/Cd/include/CGAL/Cartesian/Tetrahedron_d.h
@ -22,22 +22,13 @@
 #ifndef CGAL_CARTESIAN_TETRAHEDRON_D_H
 #define CGAL_CARTESIAN_TETRAHEDRON_D_H

-#ifndef CGAL_CARTESIAN_REDEFINE_NAMES_D_H
 #include <CGAL/Cartesian/redefine_names_d.h>
-#endif
-
-#ifndef CGAL_CARTESIAN_FOURTUPLE_H
 #include <CGAL/Fourtuple.h>
-#endif // CGAL_CARTESIAN_FOURTUPLE_H

 CGAL_BEGIN_NAMESPACE

 template <class R_>
-class TetrahedronCd
-#ifndef CGAL_CFG_NO_ADVANCED_KERNEL
-// This is a partial specialization
-<R_,Cartesian_tag>
-#endif
+class TetrahedronCd CGAL_ADVANCED_KERNEL_PARTIAL_SPEC
  : public Handle
 {
 public:
@ -101,9 +92,7 @@ private:
 CGAL_END_NAMESPACE

 #ifndef CGAL_CARTESIAN_CLASS_DEFINED
-#ifndef CGAL_CARTESIAN_TETRAHEDRON_D_C
 #include <CGAL/Cartesian/Tetrahedron_d.C>
-#endif
 #endif 

 #endif
--- a/Old_Packages/Cd/include/CGAL/Cartesian/Triangle_d.h
+++ b/Old_Packages/Cd/include/CGAL/Cartesian/Triangle_d.h
@ -28,11 +28,7 @@
 CGAL_BEGIN_NAMESPACE

 template <class R_>
-class TriangleCd
-#ifndef CGAL_CFG_NO_ADVANCED_KERNEL
-// This is a partial specialization
-<R_,Cartesian_tag>
-#endif
+class TriangleCd CGAL_ADVANCED_KERNEL_PARTIAL_SPEC
  : public Handle
 {
 public:
--- a/Old_Packages/Cd/include/CGAL/Cartesian/Vector_d.h
+++ b/Old_Packages/Cd/include/CGAL/Cartesian/Vector_d.h
@ -31,11 +31,7 @@
 CGAL_BEGIN_NAMESPACE

 template < class R_ >
-class VectorCd
-#ifndef CGAL_CFG_NO_ADVANCED_KERNEL
-// This is a partial specialization
-<R_,Cartesian_tag>
-#endif
+class VectorCd CGAL_ADVANCED_KERNEL_PARTIAL_SPEC
  : public Handle
 {
 public:
--- a/Old_Packages/Cd/include/CGAL/Cartesian/predicates_on_points_d.h
+++ b/Old_Packages/Cd/include/CGAL/Cartesian/predicates_on_points_d.h
@ -38,7 +38,7 @@ compare_lexicographically_d(const PointCd<R CGAL_CTAG> &p,
                            const PointCd<R CGAL_CTAG> &q)
 {
  CGAL_kernel_precondition( p.dimension()==q.dimension() );
-  return Comparison_result( CGAL::sign(
+  return Comparison_result( CGAL_NTS sign(
     std::lexicographical_compare_3way(p.begin(),p.end(),q.begin(),q.end()) ));
 }

--- a/Old_Packages/Cd/include/CGAL/Cartesian/redefine_names_d.h
+++ b/Old_Packages/Cd/include/CGAL/Cartesian/redefine_names_d.h
@ -55,10 +55,14 @@
 // We unify this with PointCd<R CGAL_CTAG >::function
 #define CGAL_CTAG   , Cartesian_tag

+#define CGAL_ADVANCED_KERNEL_PARTIAL_SPEC <R_,Cartesian_tag>
+
 #else

-#define CGAL_CTAG   
+#define CGAL_CTAG

+#define CGAL_ADVANCED_KERNEL_PARTIAL_SPEC
+ 
 // Note that it was not possible to keep the opposite (changing the
 // Point_d into PointCd for Stefan's design) because it would also
 // change "typename R::Point_d" into "typename R::PointCd" inside the
--- a/Old_Packages/Cd/include/CGAL/Cartesian/solve_d.h
+++ b/Old_Packages/Cd/include/CGAL/Cartesian/solve_d.h
@ -22,10 +22,7 @@
 #ifndef CGAL_CARTESIAN_CARTESIAN_SOLVE_D_H
 #define CGAL_CARTESIAN_CARTESIAN_SOLVE_D_H

-#ifndef CGAL_CARTESIAN_REDEFINE_NAMES_D_H
 #include <CGAL/Cartesian/redefine_names_d.h>
-#endif
-
 #include <CGAL/solve.h>
 #include <CGAL/Cartesian/Vector_d.h>

@ -47,4 +44,4 @@ void solve (const VectorCd<R CGAL_CTAG> &v0,

 CGAL_END_NAMESPACE

-#endif // CGAL_CARTESIAN_CARTESIAN_SOLVE_3_H
+#endif // CGAL_CARTESIAN_CARTESIAN_SOLVE_D_H
--- a/Old_Packages/Cd/test/KernelCd/makefile
+++ b/Old_Packages/Cd/test/KernelCd/makefile
@ -14,12 +14,12 @@ include $(CGAL_MAKEFILE)
 #---------------------------------------------------------------------#

 CXXFLAGS = \
+           -I../../include \
           $(TESTSUITE_CXXFLAGS) \
           $(EXTRA_FLAGS) \
 	   -I./include \
 	   -DCGAL_CFG_NO_ADVANCED_KERNEL \
 	   -DCGAL_NO_LEDA_HANDLE \
-           -I../../include \
 	   -I../../../C2/include \
 	   -I../../../C3/include \
 	   -I../../../Cartesian_basic/include \
--- a/Old_Packages/Cd/test/KernelCd/test_kernelCd.C
+++ b/Old_Packages/Cd/test/KernelCd/test_kernelCd.C
@ -21,6 +21,7 @@
 // ============================================================================


+#include <CGAL/basic.h>
 #include <iostream>
 #include <strstream>
 #include <cassert>