- Modified return types "typename R::RT" for VC++.

This commit is contained in:
Sylvain Pion 2001-02-19 13:29:44 +00:00
parent 7054c39a06
commit eaf6094b0e
10 changed files with 78 additions and 74 deletions

View File

@ -1,3 +1,6 @@
2.18 (?? Feb 2001)
- Modified return types "typename R::RT" for VC++.
2.17 (15 Feb 2001)
- Add some "#define typename" to please VC++.

View File

@ -748,14 +748,14 @@ is_odd() const
template < class R >
inline
typename R::FT
typename Aff_transformationH2<R>::FT
Aff_transformationH2<R>::
cartesian(int i, int j) const
{ return ptr->cartesian(i,j); }
template < class R >
inline
typename R::RT
typename Aff_transformationH2<R>::RT
Aff_transformationH2<R>::
homogeneous(int i, int j) const
{ return ptr->homogeneous(i,j); }
@ -790,7 +790,7 @@ return Aff_transformationH2<R>(
}
template < class R >
typename R::RT
typename Aff_transformation_repH2<R>::RT
Aff_transformation_repH2<R>::homogeneous(int i, int j) const
{
CGAL_kernel_precondition( (i >= 0) && (i <= 2) && (j >= 0) && (j <= 2) );
@ -819,7 +819,7 @@ Aff_transformation_repH2<R>::homogeneous(int i, int j) const
}
template < class R >
typename R::FT
typename Aff_transformation_repH2<R>::FT
Aff_transformation_repH2<R>::cartesian(int i, int j) const
{
CGAL_kernel_precondition( (i >= 0) && (i <= 2) && (j >= 0) && (j <= 2) );
@ -828,7 +828,7 @@ Aff_transformation_repH2<R>::cartesian(int i, int j) const
}
template < class R >
typename R::RT
typename Translation_repH2<R>::RT
Translation_repH2<R>::homogeneous(int i, int j) const
{
CGAL_kernel_precondition( (i >= 0) && (i <= 2) && (j >= 0) && (j <= 2) );
@ -857,7 +857,7 @@ Translation_repH2<R>::homogeneous(int i, int j) const
}
template < class R >
typename R::FT
typename Translation_repH2<R>::FT
Translation_repH2<R>::cartesian(int i, int j) const
{
CGAL_kernel_precondition( (i >= 0) && (i <= 2) && (j >= 0) && (j <= 2) );
@ -886,7 +886,7 @@ Translation_repH2<R>::cartesian(int i, int j) const
}
template < class R >
typename R::RT
typename Rotation_repH2<R>::RT
Rotation_repH2<R>::
homogeneous(int i, int j) const
{
@ -916,7 +916,7 @@ homogeneous(int i, int j) const
}
template < class R >
typename R::FT
typename Rotation_repH2<R>::FT
Rotation_repH2<R>::
cartesian(int i, int j) const
{
@ -946,7 +946,7 @@ cartesian(int i, int j) const
}
template < class R >
typename R::RT
typename Scaling_repH2<R>::RT
Scaling_repH2<R>::
homogeneous(int i, int j) const
{
@ -976,7 +976,7 @@ homogeneous(int i, int j) const
}
template <class R>
typename R::FT
typename Scaling_repH2<R>::FT
Scaling_repH2<R>::
cartesian(int i, int j) const
{
@ -1006,7 +1006,7 @@ cartesian(int i, int j) const
}
template < class R >
typename R::RT
typename Reflection_repH2<R>::RT
Reflection_repH2<R>::
homogeneous(int i, int j) const
{
@ -1037,7 +1037,7 @@ homogeneous(int i, int j) const
}
template <class R>
typename R::FT
typename Reflection_repH2<R>::FT
Reflection_repH2<R>::
cartesian(int i, int j) const
{

View File

@ -166,7 +166,7 @@ CircleH2<R>::center() const
template <class R>
inline
typename R::FT
typename CircleH2<R>::FT
CircleH2<R>::squared_radius() const
{ return Ptr()->squared_radius; }

View File

@ -148,26 +148,26 @@ LineH2<R>::LineH2(const PointH2<R>& p,
template < class R >
inline
typename R::RT
typename LineH2<R>::RT
LineH2<R>::a() const
{ return Ptr()->e0; }
template < class R >
inline
typename R::RT
typename LineH2<R>::RT
LineH2<R>::b() const
{ return Ptr()->e1; }
template < class R >
inline
typename R::RT
typename LineH2<R>::RT
LineH2<R>::c() const
{ return Ptr()->e2; }
template < class R >
CGAL_KERNEL_INLINE
typename R::FT
typename LineH2<R>::FT
LineH2<R>::x_at_y(FT y) const
{
CGAL_kernel_precondition( !is_degenerate() );
@ -176,7 +176,7 @@ LineH2<R>::x_at_y(FT y) const
template < class R >
CGAL_KERNEL_INLINE
typename R::FT
typename LineH2<R>::FT
LineH2<R>::y_at_x(FT x) const
{
CGAL_kernel_precondition( !is_degenerate() );

View File

@ -32,6 +32,7 @@
#include <CGAL/homogeneous_classes.h>
#include <CGAL/Origin.h>
#include <CGAL/Bbox_2.h>
#include <CGAL/misc.h>
#include <CGAL/point_vector_declarationsH2.h>
@ -283,7 +284,7 @@ PointH2<R>::operator!=( const PointH2<R>& p) const
template < class R >
CGAL_KERNEL_INLINE
typename R::FT
typename PointH2<R>::FT
PointH2<R>::cartesian(int i) const
{
CGAL_kernel_precondition( (i==0 || i==1) );
@ -294,7 +295,7 @@ PointH2<R>::cartesian(int i) const
template < class R >
CGAL_KERNEL_INLINE
typename R::RT
typename PointH2<R>::RT
PointH2<R>::homogeneous(int i) const
{
CGAL_kernel_precondition( (i>=0) && (i<=2) );
@ -307,7 +308,7 @@ PointH2<R>::homogeneous(int i) const
template < class R >
inline
typename R::FT
typename PointH2<R>::FT
PointH2<R>::operator[](int i) const
{ return cartesian(i); }
@ -394,7 +395,7 @@ VectorH2<R>::operator!=( const VectorH2<R>& v) const
template < class R >
CGAL_KERNEL_INLINE
typename R::FT
typename VectorH2<R>::FT
VectorH2<R>::cartesian(int i) const
{
CGAL_kernel_precondition( (i==0 || i==1) );
@ -405,7 +406,7 @@ VectorH2<R>::cartesian(int i) const
template < class R >
CGAL_KERNEL_INLINE
typename R::RT
typename VectorH2<R>::RT
VectorH2<R>::homogeneous(int i) const
{
CGAL_kernel_precondition( (i>=0) && (i<=2) );
@ -418,7 +419,7 @@ VectorH2<R>::homogeneous(int i) const
template < class R >
inline
typename R::FT
typename VectorH2<R>::FT
VectorH2<R>::operator[](int i) const
{ return cartesian(i); }
@ -505,7 +506,7 @@ DirectionH2<R>::operator-() const
template <class R >
CGAL_KERNEL_INLINE
typename R::RT
typename DirectionH2<R>::RT
DirectionH2<R>::delta(int i) const
{
CGAL_kernel_precondition( ( i == 0 ) || ( i == 1 ) );
@ -697,8 +698,6 @@ counterclockwise_in_between( const DirectionH2<R>& d1,
CGAL_END_NAMESPACE
#include <CGAL/Aff_transformationH2.h>
#include <CGAL/Bbox_2.h>
#include <CGAL/misc.h>
CGAL_BEGIN_NAMESPACE

View File

@ -191,7 +191,7 @@ SegmentH2<R>::operator[](int i) const
template < class R >
CGAL_KERNEL_INLINE
typename R::FT
typename SegmentH2<R>::FT
SegmentH2<R>::squared_length() const
{ return (Ptr()->end - Ptr()->start) * (Ptr()->end - Ptr()->start); }

View File

@ -142,7 +142,7 @@ TriangleH2<R>::operator[](int i) const
template <class R>
inline
typename R::FT
typename TriangleH2<R>::FT
TriangleH2<R>::area() const
{
VectorH2<R> v1 = vertex(1) - vertex(0);

View File

@ -1,5 +1,6 @@
2.19 (?? Feb 2001)
- Use the function object Less_xyz_3 instead of CGAL::Less_xyz<>.
- Modified return types "typename R::RT" for VC++.
2.18 (15 Feb 2001)
- Add some "#define typename" to please VC++.

View File

@ -187,43 +187,43 @@ Iso_cuboidH3<R>::max() const
template < class R >
inline
typename R::FT
typename Iso_cuboidH3<R>::FT
Iso_cuboidH3<R>::xmin() const
{ return FT( min().hx() ) / FT( min().hw() ); }
template < class R >
inline
typename R::FT
typename Iso_cuboidH3<R>::FT
Iso_cuboidH3<R>::ymin() const
{ return FT( min().hy() ) / FT( min().hw() ); }
template < class R >
inline
typename R::FT
typename Iso_cuboidH3<R>::FT
Iso_cuboidH3<R>::zmin() const
{ return FT( min().hz() ) / FT( min().hw() ); }
template < class R >
inline
typename R::FT
typename Iso_cuboidH3<R>::FT
Iso_cuboidH3<R>::xmax() const
{ return FT( max().hx() ) / FT( max().hw() ); }
template < class R >
inline
typename R::FT
typename Iso_cuboidH3<R>::FT
Iso_cuboidH3<R>::ymax() const
{ return FT( max().hy() ) / FT( max().hw() ); }
template < class R >
inline
typename R::FT
typename Iso_cuboidH3<R>::FT
Iso_cuboidH3<R>::zmax() const
{ return FT( max().hz() ) / FT( max().hw() ); }
template < class R >
inline
typename R::FT
typename Iso_cuboidH3<R>::FT
Iso_cuboidH3<R>::min_coord(int i) const
{
CGAL_kernel_precondition(i == 0 || i == 1 || i == 2);
@ -236,7 +236,7 @@ Iso_cuboidH3<R>::min_coord(int i) const
template < class R >
inline
typename R::FT
typename Iso_cuboidH3<R>::FT
Iso_cuboidH3<R>::max_coord(int i) const
{
CGAL_kernel_precondition(i == 0 || i == 1 || i == 2);
@ -249,7 +249,7 @@ Iso_cuboidH3<R>::max_coord(int i) const
template < class R >
inline
typename R::FT
typename Iso_cuboidH3<R>::FT
Iso_cuboidH3<R>::volume() const
{ return (xmax() - xmin()) * (ymax() - ymin()) * (zmax() - zmin()); }
@ -346,6 +346,7 @@ Iso_cuboidH3<R>::is_degenerate() const
|| ( min().hy() == max().hy() )
|| ( min().hz() == max().hz() ) );
}
template < class R >
inline
Bbox_2

View File

@ -31,6 +31,7 @@
#include <CGAL/homogeneous_classes.h>
#include <CGAL/Origin.h>
#include <CGAL/Bbox_3.h>
#include <CGAL/misc.h>
CGAL_BEGIN_NAMESPACE
@ -354,67 +355,67 @@ PointH3<R>::PointH3(const RT& x, const RT& y, const RT& z,
template < class R >
CGAL_KERNEL_INLINE
typename R::FT
typename PointH3<R>::FT
PointH3<R>::x() const
{ return ( FT(Ptr()->hx() ) / FT(Ptr()->hw() )); }
template < class R >
CGAL_KERNEL_INLINE
typename R::FT
typename PointH3<R>::FT
PointH3<R>::y() const
{ return ( FT(Ptr()->hy() ) / FT(Ptr()->hw() )); }
template < class R >
CGAL_KERNEL_INLINE
typename R::FT
typename PointH3<R>::FT
PointH3<R>::z() const
{ return ( FT(Ptr()->hz() ) / FT(Ptr()->hw() )); }
template < class R >
inline
typename R::RT
typename PointH3<R>::RT
PointH3<R>::hx() const
{ return Ptr()->hx() ; }
template < class R >
inline
typename R::RT
typename PointH3<R>::RT
PointH3<R>::hy() const
{ return Ptr()->hy() ; }
template < class R >
inline
typename R::RT
typename PointH3<R>::RT
PointH3<R>::hz() const
{ return Ptr()->hz() ; }
template < class R >
inline
typename R::RT
typename PointH3<R>::RT
PointH3<R>::hw() const
{ return Ptr()->hw(); }
template < class R >
inline
const typename R::RT&
const typename PointH3<R>::RT&
PointH3<R>::hx_ref() const
{ return Ptr()->e0 ; }
template < class R >
inline
const typename R::RT&
const typename PointH3<R>::RT&
PointH3<R>::hy_ref() const
{ return Ptr()->e1 ; }
template < class R >
inline
const typename R::RT&
const typename PointH3<R>::RT&
PointH3<R>::hz_ref() const
{ return Ptr()->e2 ; }
template < class R >
inline
const typename R::RT&
const typename PointH3<R>::RT&
PointH3<R>::hw_ref() const
{ return Ptr()->e3; }
@ -426,7 +427,7 @@ PointH3<R>::dimension() const
template < class R >
CGAL_KERNEL_INLINE
typename R::FT
typename PointH3<R>::FT
PointH3<R>::cartesian(int i) const
{
CGAL_kernel_precondition(i == 0 || i == 1 || i == 2);
@ -440,7 +441,7 @@ PointH3<R>::cartesian(int i) const
template < class R >
CGAL_KERNEL_INLINE
typename R::RT
typename PointH3<R>::RT
PointH3<R>::homogeneous(int i) const
{
CGAL_kernel_precondition(i == 0 || i == 1 || i == 2 || i == 3);
@ -455,7 +456,7 @@ PointH3<R>::homogeneous(int i) const
template < class R >
inline
typename R::FT
typename PointH3<R>::FT
PointH3<R>::operator[](int i) const
{ return cartesian(i); }
@ -464,6 +465,7 @@ inline
DirectionH3<R>
PointH3<R>::direction() const
{ return DirectionH3<R>(*this); }
template < class R >
CGAL_KERNEL_INLINE
bool
@ -539,43 +541,43 @@ VectorH3<R>::VectorH3(const RT& x, const RT& y, const RT& z, const RT& w)
template < class R >
CGAL_KERNEL_INLINE
typename R::FT
typename VectorH3<R>::FT
VectorH3<R>::x() const
{ return FT(Ptr()->hx() )/FT(Ptr()->hw() ) ; }
template < class R >
CGAL_KERNEL_INLINE
typename R::FT
typename VectorH3<R>::FT
VectorH3<R>::y() const
{ return FT(Ptr()->hy() )/FT(Ptr()->hw() ) ; }
template < class R >
CGAL_KERNEL_INLINE
typename R::FT
typename VectorH3<R>::FT
VectorH3<R>::z() const
{ return FT(Ptr()->hz() )/FT(Ptr()->hw() ) ; }
template < class R >
inline
typename R::RT
typename VectorH3<R>::RT
VectorH3<R>::hx() const
{ return Ptr()->hx() ; }
template < class R >
inline
typename R::RT
typename VectorH3<R>::RT
VectorH3<R>::hy() const
{ return Ptr()->hy() ; }
template < class R >
inline
typename R::RT
typename VectorH3<R>::RT
VectorH3<R>::hz() const
{ return Ptr()->hz() ; }
template < class R >
inline
typename R::RT
typename VectorH3<R>::RT
VectorH3<R>::hw() const
{ return Ptr()->hw() ; }
@ -587,7 +589,7 @@ VectorH3<R>::dimension() const
template < class R >
CGAL_KERNEL_INLINE
typename R::FT
typename VectorH3<R>::FT
VectorH3<R>::cartesian(int i) const
{
CGAL_kernel_precondition(i == 0 || i == 1 || i == 2);
@ -601,7 +603,7 @@ VectorH3<R>::cartesian(int i) const
template < class R >
CGAL_KERNEL_INLINE
typename R::RT
typename VectorH3<R>::RT
VectorH3<R>::homogeneous(int i) const
{
CGAL_kernel_precondition(i == 0 || i == 1 || i == 2 || i == 3);
@ -638,7 +640,7 @@ VectorH3<R>::operator!=( const VectorH3<R>& v) const
template < class R >
inline
typename R::FT
typename VectorH3<R>::FT
VectorH3<R>::operator[](int i) const
{ return cartesian(i); }
@ -661,7 +663,7 @@ DirectionH3<R>::DirectionH3(const RT& x, const RT& y, const RT& z,
template <class R >
CGAL_KERNEL_INLINE
typename R::RT
typename DirectionH3<R>::RT
DirectionH3<R>::delta(int i) const
{
switch (i)
@ -675,55 +677,55 @@ DirectionH3<R>::delta(int i) const
template <class R >
inline
typename R::RT
typename DirectionH3<R>::RT
DirectionH3<R>::dx() const
{ return Ptr()->e0; }
template <class R >
inline
typename R::RT
typename DirectionH3<R>::RT
DirectionH3<R>::x() const
{ return Ptr()->e0; }
template <class R >
inline
typename R::RT
typename DirectionH3<R>::RT
DirectionH3<R>::hx() const
{ return Ptr()->e0; }
template <class R >
inline
typename R::RT
typename DirectionH3<R>::RT
DirectionH3<R>::dy() const
{ return Ptr()->e1; }
template <class R >
inline
typename R::RT
typename DirectionH3<R>::RT
DirectionH3<R>::y() const
{ return Ptr()->e1; }
template <class R >
inline
typename R::RT
typename DirectionH3<R>::RT
DirectionH3<R>::hy() const
{ return Ptr()->e1; }
template <class R >
inline
typename R::RT
typename DirectionH3<R>::RT
DirectionH3<R>::dz() const
{ return Ptr()->e2; }
template <class R >
inline
typename R::RT
typename DirectionH3<R>::RT
DirectionH3<R>::z() const
{ return Ptr()->e2; }
template <class R >
inline
typename R::RT
typename DirectionH3<R>::RT
DirectionH3<R>::hz() const
{ return Ptr()->e2; }
@ -899,8 +901,6 @@ cross_product( const DirectionH3<R>& d1,
CGAL_END_NAMESPACE
#include <CGAL/Aff_transformationH3.h>
#include <CGAL/Bbox_3.h>
#include <CGAL/misc.h>
CGAL_BEGIN_NAMESPACE