Version 3.6.3 (October 12 1999)

- Reverted the typename R::FT in *.C to typename Classname<R>::FT [Geert-Jan]
  Should now work on M$VC++ as well because of that change
- Will work on egcs 1.1.2 once direction.vector() is changed to
  to_vector() everywhere in CGAL (pending decision).
This commit is contained in:
Hervé Brönnimann 1999-10-12 15:37:46 +00:00
parent 4ccdde18fc
commit dfcd1f7f74
7 changed files with 97 additions and 86 deletions

View File

@ -1,3 +1,9 @@
Version 3.6.3 (October 12 1999)
- Reverted the typename R::FT in *.C to typename Classname<R>::FT [Geert-Jan]
Should now work on M$VC++ as well because of that change
- Will work on egcs 1.1.2 once direction.vector() is changed to
to_vector() everywhere in CGAL (pending decision).
Version 3.6.2 (October 11 1999)
- Fixed projection_lineC3 that led to bug of version 3.6.1

View File

@ -1,4 +1,4 @@
// ==========================================================================
// ======================================================================
//
// Copyright (c) 1998 The CGAL Consortium
//
@ -6,12 +6,13 @@
// of the Computational Geometry Algorithms Library (CGAL). It is not
// intended for general use.
//
// --------------------------------------------------------------------------
// ----------------------------------------------------------------------
//
// release :
// release_date :
// release : $CGAL_Revision: CGAL-2.1-I-28 $
// release_date : $CGAL_Date: 1999/10/12 $
//
// file : include/CGAL/Direction_3.C
// file : include/CGAL/Cartesian/Direction_3.C
// package : C3 (3.6.2)
// source : include/CGAL/Cartesian/Direction_3.C
// revision : $Revision$
// revision_date : $Date$
@ -19,7 +20,7 @@
//
// coordinator : INRIA Sophia-Antipolis (Herve.Bronnimann@sophia.inria.fr)
//
// ==========================================================================
// ======================================================================
#ifndef CGAL_CARTESIAN_REDEFINE_NAMES_3_H
#define CGAL_CTAG
@ -61,9 +62,9 @@ DirectionC3(const typename DirectionC3<R CGAL_CTAG>::Vector_3 &v)
template < class R >
DirectionC3<R CGAL_CTAG>::
DirectionC3(const typename R::FT &x,
const typename R::FT &y,
const typename R::FT &z)
DirectionC3(const typename DirectionC3<R CGAL_CTAG>::FT &x,
const typename DirectionC3<R CGAL_CTAG>::FT &y,
const typename DirectionC3<R CGAL_CTAG>::FT &z)
{
PTR = new _Threetuple<typename R::FT>(x, y, z);
}
@ -132,7 +133,7 @@ DirectionC3<R CGAL_CTAG>::operator-() const
template < class R >
typename R::FT
typename DirectionC3<R CGAL_CTAG>::FT
DirectionC3<R CGAL_CTAG>::delta(int i) const
{
CGAL_kernel_precondition( i >= 0 && i <= 2 );
@ -142,7 +143,7 @@ DirectionC3<R CGAL_CTAG>::delta(int i) const
template < class R >
inline
typename R::FT
typename DirectionC3<R CGAL_CTAG>::FT
DirectionC3<R CGAL_CTAG>::dx() const
{
return ptr()->e0;
@ -150,7 +151,7 @@ DirectionC3<R CGAL_CTAG>::dx() const
template < class R >
inline
typename R::FT
typename DirectionC3<R CGAL_CTAG>::FT
DirectionC3<R CGAL_CTAG>::dy() const
{
return ptr()->e1;
@ -159,7 +160,7 @@ DirectionC3<R CGAL_CTAG>::dy() const
template < class R >
inline
typename R::FT
typename DirectionC3<R CGAL_CTAG>::FT
DirectionC3<R CGAL_CTAG>::dz() const
{
return ptr()->e2;
@ -167,7 +168,7 @@ DirectionC3<R CGAL_CTAG>::dz() const
template < class R >
inline
typename R::FT
typename DirectionC3<R CGAL_CTAG>::FT
DirectionC3<R CGAL_CTAG>::hdx() const
{
return ptr()->e0;
@ -176,7 +177,7 @@ DirectionC3<R CGAL_CTAG>::hdx() const
template < class R >
inline
typename R::FT
typename DirectionC3<R CGAL_CTAG>::FT
DirectionC3<R CGAL_CTAG>::hdy() const
{
return ptr()->e1;
@ -184,7 +185,7 @@ DirectionC3<R CGAL_CTAG>::hdy() const
template < class R >
inline
typename R::FT
typename DirectionC3<R CGAL_CTAG>::FT
DirectionC3<R CGAL_CTAG>::hdz() const
{
return ptr()->e2;
@ -192,7 +193,7 @@ DirectionC3<R CGAL_CTAG>::hdz() const
template < class R >
inline
typename R::FT
typename DirectionC3<R CGAL_CTAG>::FT
DirectionC3<R CGAL_CTAG>::hw() const
{
return FT(1);

View File

@ -1,4 +1,4 @@
// ==========================================================================
// ======================================================================
//
// Copyright (c) 1998 The CGAL Consortium
//
@ -6,12 +6,13 @@
// of the Computational Geometry Algorithms Library (CGAL). It is not
// intended for general use.
//
// --------------------------------------------------------------------------
// ----------------------------------------------------------------------
//
// release :
// release_date :
// release : $CGAL_Revision: CGAL-2.1-I-28 $
// release_date : $CGAL_Date: 1999/10/12 $
//
// file : include/CGAL/Cartesian/Plane_3.C
// package : C3 (3.6.2)
// source : include/CGAL/Cartesian/Plane_3.C
// revision : $Revision$
// revision_date : $Date$
@ -19,7 +20,7 @@
//
// coordinator : INRIA Sophia-Antipolis (Herve.Bronnimann@sophia.inria.fr)
//
// ==========================================================================
// ======================================================================
#ifndef CGAL_CARTESIAN_REDEFINE_NAMES_3_H
#define CGAL_CTAG
@ -50,10 +51,10 @@ template < class R >
inline
void
PlaneC3<R CGAL_CTAG>::
new_rep(const typename R::FT &a,
const typename R::FT &b,
const typename R::FT &c,
const typename R::FT &d)
new_rep(const typename PlaneC3<R CGAL_CTAG>::FT &a,
const typename PlaneC3<R CGAL_CTAG>::FT &b,
const typename PlaneC3<R CGAL_CTAG>::FT &c,
const typename PlaneC3<R CGAL_CTAG>::FT &d)
{
PTR = new _Fourtuple<FT>(a, b, c, d);
}
@ -118,10 +119,10 @@ PlaneC3(const typename PlaneC3<R CGAL_CTAG>::Point_3 &p,
template < class R >
inline
PlaneC3<R CGAL_CTAG>::
PlaneC3(const typename R::FT &a,
const typename R::FT &b,
const typename R::FT &c,
const typename R::FT &d)
PlaneC3(const typename PlaneC3<R CGAL_CTAG>::FT &a,
const typename PlaneC3<R CGAL_CTAG>::FT &b,
const typename PlaneC3<R CGAL_CTAG>::FT &c,
const typename PlaneC3<R CGAL_CTAG>::FT &d)
{
new_rep(a, b, c, d);
}
@ -191,7 +192,7 @@ long PlaneC3<R CGAL_CTAG>::id() const
template < class R >
inline
typename R::FT
typename PlaneC3<R CGAL_CTAG>::FT
PlaneC3<R CGAL_CTAG>::a() const
{
return ptr()->e0;
@ -199,7 +200,7 @@ PlaneC3<R CGAL_CTAG>::a() const
template < class R >
inline
typename R::FT
typename PlaneC3<R CGAL_CTAG>::FT
PlaneC3<R CGAL_CTAG>::b() const
{
return ptr()->e1;
@ -207,7 +208,7 @@ PlaneC3<R CGAL_CTAG>::b() const
template < class R >
inline
typename R::FT
typename PlaneC3<R CGAL_CTAG>::FT
PlaneC3<R CGAL_CTAG>::c() const
{
return ptr()->e2;
@ -215,7 +216,7 @@ PlaneC3<R CGAL_CTAG>::c() const
template < class R >
inline
typename R::FT
typename PlaneC3<R CGAL_CTAG>::FT
PlaneC3<R CGAL_CTAG>::d() const
{
return ptr()->e3;

View File

@ -1,4 +1,4 @@
// ==========================================================================
// ======================================================================
//
// Copyright (c) 1998 The CGAL Consortium
//
@ -6,12 +6,13 @@
// of the Computational Geometry Algorithms Library (CGAL). It is not
// intended for general use.
//
// --------------------------------------------------------------------------
// ----------------------------------------------------------------------
//
// release :
// release_date :
// release : $CGAL_Revision: CGAL-2.1-I-28 $
// release_date : $CGAL_Date: 1999/10/12 $
//
// file : include/CGAL/Cartesian/Point_3.C
// package : C3 (3.6.2)
// source : include/CGAL/Cartesian/Point_3.C
// revision : $Revision$
// revision_date : $Date$
@ -19,7 +20,7 @@
//
// coordinator : INRIA Sophia-Antipolis (Herve.Bronnimann@sophia.inria.fr)
//
// ==========================================================================
// ======================================================================
#ifndef CGAL_CARTESIAN_REDEFINE_NAMES_3_H
#define CGAL_CTAG
@ -71,17 +72,17 @@ PointC3<R CGAL_CTAG>::PointC3(const PointC3<R CGAL_CTAG> &p) :
}
template < class R >
PointC3<R CGAL_CTAG>::PointC3(const typename R::FT &x,
const typename R::FT &y,
const typename R::FT &z)
PointC3<R CGAL_CTAG>::PointC3(const typename PointC3<R CGAL_CTAG>::FT &x,
const typename PointC3<R CGAL_CTAG>::FT &y,
const typename PointC3<R CGAL_CTAG>::FT &z)
{
PTR = new _Threetuple<FT>(x, y, z);
}
template < class R >
PointC3<R CGAL_CTAG>::PointC3(const typename R::FT &x,
const typename R::FT &y,
const typename R::FT &z,
PointC3<R CGAL_CTAG>::PointC3(const typename PointC3<R CGAL_CTAG>::FT &x,
const typename PointC3<R CGAL_CTAG>::FT &y,
const typename PointC3<R CGAL_CTAG>::FT &z,
const FT &w)
{
if (w != FT(1))
@ -134,7 +135,7 @@ PointC3<R CGAL_CTAG>::id() const
template < class R >
inline
typename R::FT
typename PointC3<R CGAL_CTAG>::FT
PointC3<R CGAL_CTAG>::x() const
{
return ptr()->e0;
@ -143,7 +144,7 @@ PointC3<R CGAL_CTAG>::x() const
template < class R >
inline
typename R::FT
typename PointC3<R CGAL_CTAG>::FT
PointC3<R CGAL_CTAG>::y() const
{
return ptr()->e1;
@ -152,7 +153,7 @@ PointC3<R CGAL_CTAG>::y() const
template < class R >
inline
typename R::FT
typename PointC3<R CGAL_CTAG>::FT
PointC3<R CGAL_CTAG>::z() const
{
return ptr()->e2;
@ -170,7 +171,7 @@ PointC3<R CGAL_CTAG>::dimension() const
template < class R >
inline
typename R::FT
typename PointC3<R CGAL_CTAG>::FT
PointC3<R CGAL_CTAG>::cartesian(int i) const
{
CGAL_kernel_precondition( (i>=0) && (i<=2) );
@ -181,7 +182,7 @@ PointC3<R CGAL_CTAG>::cartesian(int i) const
template < class R >
inline
typename R::FT
typename PointC3<R CGAL_CTAG>::FT
PointC3<R CGAL_CTAG>::operator[](int i) const
{
return cartesian(i);
@ -190,7 +191,7 @@ PointC3<R CGAL_CTAG>::operator[](int i) const
template < class R >
inline
typename R::FT
typename PointC3<R CGAL_CTAG>::FT
PointC3<R CGAL_CTAG>::hx() const
{
return ptr()->e0;
@ -199,7 +200,7 @@ PointC3<R CGAL_CTAG>::hx() const
template < class R >
inline
typename R::FT
typename PointC3<R CGAL_CTAG>::FT
PointC3<R CGAL_CTAG>::hy() const
{
return ptr()->e1;
@ -208,7 +209,7 @@ PointC3<R CGAL_CTAG>::hy() const
template < class R >
inline
typename R::FT
typename PointC3<R CGAL_CTAG>::FT
PointC3<R CGAL_CTAG>::hz() const
{
return ptr()->e2;
@ -217,14 +218,14 @@ PointC3<R CGAL_CTAG>::hz() const
template < class R >
inline
typename R::FT
typename PointC3<R CGAL_CTAG>::FT
PointC3<R CGAL_CTAG>::hw() const
{
return FT(1);
}
template < class R >
typename R::FT
typename PointC3<R CGAL_CTAG>::FT
PointC3<R CGAL_CTAG>::homogeneous(int i) const
{
CGAL_kernel_precondition((i>=0) && (i<=3));

View File

@ -1,4 +1,4 @@
// ==========================================================================
// ======================================================================
//
// Copyright (c) 1998 The CGAL Consortium
//
@ -6,12 +6,13 @@
// of the Computational Geometry Algorithms Library (CGAL). It is not
// intended for general use.
//
// --------------------------------------------------------------------------
// ----------------------------------------------------------------------
//
// release :
// release_date :
// release : $CGAL_Revision: CGAL-2.1-I-28 $
// release_date : $CGAL_Date: 1999/10/12 $
//
// file : include/CGAL/Cartesian/Segment_3.C
// package : C3 (3.6.2)
// source : include/CGAL/Cartesian/Segment_3.C
// revision : $Revision$
// revision_date : $Date$
@ -19,7 +20,7 @@
//
// coordinator : INRIA Sophia-Antipolis (Herve.Bronnimann@sophia.inria.fr)
//
// ==========================================================================
// ======================================================================
#ifndef CGAL_CARTESIAN_REDEFINE_NAMES_3_H
#define CGAL_CTAG
@ -171,7 +172,7 @@ SegmentC3<R CGAL_CTAG>::operator[](int i) const
template < class R >
inline
typename R::FT
typename SegmentC3<R CGAL_CTAG>::FT
SegmentC3<R CGAL_CTAG>::squared_length() const
{
return squared_distance(target(), source());

View File

@ -1,4 +1,4 @@
// ==========================================================================
// ======================================================================
//
// Copyright (c) 1998 The CGAL Consortium
//
@ -6,12 +6,13 @@
// of the Computational Geometry Algorithms Library (CGAL). It is not
// intended for general use.
//
// --------------------------------------------------------------------------
// ----------------------------------------------------------------------
//
// release :
// release_date :
// release : $CGAL_Revision: CGAL-2.1-I-28 $
// release_date : $CGAL_Date: 1999/10/12 $
//
// file : include/CGAL/Cartesian/Vector_3.C
// package : C3 (3.6.2)
// source : include/CGAL/Cartesian/Vector_3.C
// revision : $Revision$
// revision_date : $Date$
@ -19,7 +20,7 @@
//
// coordinator : INRIA Sophia-Antipolis (Herve.Bronnimann@sophia.inria.fr)
//
// ==========================================================================
// ======================================================================
#ifndef CGAL_CARTESIAN_REDEFINE_NAMES_3_H
#define CGAL_CTAG
@ -66,19 +67,19 @@ VectorC3(const Null_vector &)
template < class R >
VectorC3<R CGAL_CTAG>::
VectorC3(const typename R::FT &x,
const typename R::FT &y,
const typename R::FT &z)
VectorC3(const typename VectorC3<R CGAL_CTAG>::FT &x,
const typename VectorC3<R CGAL_CTAG>::FT &y,
const typename VectorC3<R CGAL_CTAG>::FT &z)
{
PTR = new _Threetuple<FT>(x, y, z);
}
template < class R >
VectorC3<R CGAL_CTAG>::
VectorC3(const typename R::FT &x,
const typename R::FT &y,
const typename R::FT &z,
const typename R::FT &w)
VectorC3(const typename VectorC3<R CGAL_CTAG>::FT &x,
const typename VectorC3<R CGAL_CTAG>::FT &y,
const typename VectorC3<R CGAL_CTAG>::FT &z,
const typename VectorC3<R CGAL_CTAG>::FT &w)
{
if (w != FT(1))
PTR = new _Threetuple<FT>(x/w, y/w, z/w);
@ -147,7 +148,7 @@ long VectorC3<R CGAL_CTAG>::id() const
}
template < class R >
inline
typename R::FT
typename VectorC3<R CGAL_CTAG>::FT
VectorC3<R CGAL_CTAG>::x() const
{
return ptr()->e0;
@ -155,7 +156,7 @@ VectorC3<R CGAL_CTAG>::x() const
template < class R >
inline
typename R::FT
typename VectorC3<R CGAL_CTAG>::FT
VectorC3<R CGAL_CTAG>::y() const
{
return ptr()->e1;
@ -163,7 +164,7 @@ VectorC3<R CGAL_CTAG>::y() const
template < class R >
inline
typename R::FT
typename VectorC3<R CGAL_CTAG>::FT
VectorC3<R CGAL_CTAG>::z() const
{
return ptr()->e2;
@ -171,7 +172,7 @@ VectorC3<R CGAL_CTAG>::z() const
template < class R >
inline
typename R::FT
typename VectorC3<R CGAL_CTAG>::FT
VectorC3<R CGAL_CTAG>::cartesian(int i) const
{
CGAL_kernel_precondition( (i>=0) && (i<3) );
@ -181,7 +182,7 @@ VectorC3<R CGAL_CTAG>::cartesian(int i) const
template < class R >
inline
typename R::FT
typename VectorC3<R CGAL_CTAG>::FT
VectorC3<R CGAL_CTAG>::operator[](int i) const
{
return cartesian(i);
@ -197,7 +198,7 @@ VectorC3<R CGAL_CTAG>::dimension() const
template < class R >
inline
typename R::FT
typename VectorC3<R CGAL_CTAG>::FT
VectorC3<R CGAL_CTAG>::hx() const
{
return ptr()->e0;
@ -205,7 +206,7 @@ VectorC3<R CGAL_CTAG>::hx() const
template < class R >
inline
typename R::FT
typename VectorC3<R CGAL_CTAG>::FT
VectorC3<R CGAL_CTAG>::hy() const
{
return ptr()->e1;
@ -213,21 +214,21 @@ VectorC3<R CGAL_CTAG>::hy() const
template < class R >
inline
typename R::FT
typename VectorC3<R CGAL_CTAG>::FT
VectorC3<R CGAL_CTAG>::hz() const
{
return ptr()->e2;
}
template < class R >
typename R::FT
typename VectorC3<R CGAL_CTAG>::FT
VectorC3<R CGAL_CTAG>::hw() const
{
return FT(1);
}
template < class R >
typename R::FT
typename VectorC3<R CGAL_CTAG>::FT
VectorC3<R CGAL_CTAG>::homogeneous(int i) const
{
return (i==3) ? FT(1) : cartesian(i);
@ -259,7 +260,7 @@ VectorC3<R CGAL_CTAG> VectorC3<R CGAL_CTAG>::operator-() const
template < class R >
inline
typename R::FT
typename VectorC3<R CGAL_CTAG>::FT
VectorC3<R CGAL_CTAG>::operator*(const VectorC3<R CGAL_CTAG> &w) const
{
return x() * w.x() + y() * w.y() + z() * w.z() ;
@ -268,7 +269,7 @@ VectorC3<R CGAL_CTAG>::operator*(const VectorC3<R CGAL_CTAG> &w) const
template < class R >
inline
VectorC3<R CGAL_CTAG>
VectorC3<R CGAL_CTAG>::operator/(const typename R::FT &c) const
VectorC3<R CGAL_CTAG>::operator/(const typename VectorC3<R CGAL_CTAG>::FT &c) const
{
return VectorC3<R CGAL_CTAG>( x()/c, y()/c, z()/c) ;
}

View File

@ -1 +1 @@
3.6.2 ( 11 Oct 1999 )
3.6.3 ( 12 Oct 1999 )