diff --git a/Packages/Cartesian_kernel/include/CGAL/Cartesian.h b/Packages/Cartesian_kernel/include/CGAL/Cartesian.h index 1a8df16c382..0cfb04abb75 100644 --- a/Packages/Cartesian_kernel/include/CGAL/Cartesian.h +++ b/Packages/Cartesian_kernel/include/CGAL/Cartesian.h @@ -40,7 +40,7 @@ struct Cartesian_base_ref_count struct Handle { typedef Handle_for type; }; template < typename Kernel2 > - struct base { typedef Cartesian_base_ref_count other; }; + struct Base { typedef Cartesian_base_ref_count Type; }; // TODO: cleanup (use Rational_traits<> instead) static FT make_FT(const RT & num, const RT& denom) { return num/denom;} diff --git a/Packages/Cartesian_kernel/include/CGAL/Simple_cartesian.h b/Packages/Cartesian_kernel/include/CGAL/Simple_cartesian.h index 6a5d2d82a2e..7e94a84c362 100644 --- a/Packages/Cartesian_kernel/include/CGAL/Simple_cartesian.h +++ b/Packages/Cartesian_kernel/include/CGAL/Simple_cartesian.h @@ -40,7 +40,7 @@ struct Cartesian_base_no_ref_count struct Handle { typedef Simple_Handle_for type; }; template < typename Kernel2 > - struct base { typedef Cartesian_base_no_ref_count other; }; + struct Base { typedef Cartesian_base_no_ref_count Type; }; // TODO: cleanup (use Rational_traits<> instead) static FT make_FT(const RT & num, const RT& denom) { return num/denom;} diff --git a/Packages/H2/changes.txt b/Packages/H2/changes.txt index b48501facfa..148e5872077 100644 --- a/Packages/H2/changes.txt +++ b/Packages/H2/changes.txt @@ -1,3 +1,6 @@ +2.83 (7 May 2003) +- Changed names in kernel rebind/base mechanism + 2.82 (24 February 2003) - Remove duplicate typedef. diff --git a/Packages/H2/include/CGAL/Homogeneous.h b/Packages/H2/include/CGAL/Homogeneous.h index 4b8f40d23fa..f025baf45cc 100644 --- a/Packages/H2/include/CGAL/Homogeneous.h +++ b/Packages/H2/include/CGAL/Homogeneous.h @@ -42,8 +42,8 @@ struct Homogeneous_base_ref_count struct Handle { typedef Handle_for type; }; template < typename Kernel2 > - struct base { - typedef Homogeneous_base_ref_count other; + struct Base { + typedef Homogeneous_base_ref_count Type; }; // TODO: cleanup (use Rational_traits<> instead) diff --git a/Packages/H2/include/CGAL/Simple_homogeneous.h b/Packages/H2/include/CGAL/Simple_homogeneous.h index 60bbe917314..efcf0197241 100644 --- a/Packages/H2/include/CGAL/Simple_homogeneous.h +++ b/Packages/H2/include/CGAL/Simple_homogeneous.h @@ -42,8 +42,8 @@ struct Homogeneous_base_no_ref_count struct Handle { typedef Simple_Handle_for type; }; template < typename Kernel2 > - struct base { - typedef Homogeneous_base_no_ref_count other; + struct Base { + typedef Homogeneous_base_no_ref_count Type; }; // TODO: cleanup (use Rational_traits<> instead)