From dfcd1f7f7484a5f0137e3a9fcd8ccbe61a36b9f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Br=C3=B6nnimann?= Date: Tue, 12 Oct 1999 15:37:46 +0000 Subject: [PATCH] Version 3.6.3 (October 12 1999) - Reverted the typename R::FT in *.C to typename Classname::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). --- Old_Packages/C3/changes.txt | 6 +++ .../C3/include/CGAL/Cartesian/Direction_3.C | 35 ++++++------- .../C3/include/CGAL/Cartesian/Plane_3.C | 35 ++++++------- .../C3/include/CGAL/Cartesian/Point_3.C | 43 ++++++++-------- .../C3/include/CGAL/Cartesian/Segment_3.C | 13 ++--- .../C3/include/CGAL/Cartesian/Vector_3.C | 49 ++++++++++--------- Old_Packages/C3/version | 2 +- 7 files changed, 97 insertions(+), 86 deletions(-) diff --git a/Old_Packages/C3/changes.txt b/Old_Packages/C3/changes.txt index 1727af44c41..1b807b00f27 100644 --- a/Old_Packages/C3/changes.txt +++ b/Old_Packages/C3/changes.txt @@ -1,3 +1,9 @@ +Version 3.6.3 (October 12 1999) +- Reverted the typename R::FT in *.C to typename Classname::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 diff --git a/Old_Packages/C3/include/CGAL/Cartesian/Direction_3.C b/Old_Packages/C3/include/CGAL/Cartesian/Direction_3.C index edf46076001..675f5164eb4 100644 --- a/Old_Packages/C3/include/CGAL/Cartesian/Direction_3.C +++ b/Old_Packages/C3/include/CGAL/Cartesian/Direction_3.C @@ -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::Vector_3 &v) template < class R > DirectionC3:: -DirectionC3(const typename R::FT &x, - const typename R::FT &y, - const typename R::FT &z) +DirectionC3(const typename DirectionC3::FT &x, + const typename DirectionC3::FT &y, + const typename DirectionC3::FT &z) { PTR = new _Threetuple(x, y, z); } @@ -132,7 +133,7 @@ DirectionC3::operator-() const template < class R > -typename R::FT +typename DirectionC3::FT DirectionC3::delta(int i) const { CGAL_kernel_precondition( i >= 0 && i <= 2 ); @@ -142,7 +143,7 @@ DirectionC3::delta(int i) const template < class R > inline -typename R::FT +typename DirectionC3::FT DirectionC3::dx() const { return ptr()->e0; @@ -150,7 +151,7 @@ DirectionC3::dx() const template < class R > inline -typename R::FT +typename DirectionC3::FT DirectionC3::dy() const { return ptr()->e1; @@ -159,7 +160,7 @@ DirectionC3::dy() const template < class R > inline -typename R::FT +typename DirectionC3::FT DirectionC3::dz() const { return ptr()->e2; @@ -167,7 +168,7 @@ DirectionC3::dz() const template < class R > inline -typename R::FT +typename DirectionC3::FT DirectionC3::hdx() const { return ptr()->e0; @@ -176,7 +177,7 @@ DirectionC3::hdx() const template < class R > inline -typename R::FT +typename DirectionC3::FT DirectionC3::hdy() const { return ptr()->e1; @@ -184,7 +185,7 @@ DirectionC3::hdy() const template < class R > inline -typename R::FT +typename DirectionC3::FT DirectionC3::hdz() const { return ptr()->e2; @@ -192,7 +193,7 @@ DirectionC3::hdz() const template < class R > inline -typename R::FT +typename DirectionC3::FT DirectionC3::hw() const { return FT(1); diff --git a/Old_Packages/C3/include/CGAL/Cartesian/Plane_3.C b/Old_Packages/C3/include/CGAL/Cartesian/Plane_3.C index 22b16e5d3c4..a451b0a7613 100644 --- a/Old_Packages/C3/include/CGAL/Cartesian/Plane_3.C +++ b/Old_Packages/C3/include/CGAL/Cartesian/Plane_3.C @@ -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:: -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::FT &a, + const typename PlaneC3::FT &b, + const typename PlaneC3::FT &c, + const typename PlaneC3::FT &d) { PTR = new _Fourtuple(a, b, c, d); } @@ -118,10 +119,10 @@ PlaneC3(const typename PlaneC3::Point_3 &p, template < class R > inline PlaneC3:: -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::FT &a, + const typename PlaneC3::FT &b, + const typename PlaneC3::FT &c, + const typename PlaneC3::FT &d) { new_rep(a, b, c, d); } @@ -191,7 +192,7 @@ long PlaneC3::id() const template < class R > inline -typename R::FT +typename PlaneC3::FT PlaneC3::a() const { return ptr()->e0; @@ -199,7 +200,7 @@ PlaneC3::a() const template < class R > inline -typename R::FT +typename PlaneC3::FT PlaneC3::b() const { return ptr()->e1; @@ -207,7 +208,7 @@ PlaneC3::b() const template < class R > inline -typename R::FT +typename PlaneC3::FT PlaneC3::c() const { return ptr()->e2; @@ -215,7 +216,7 @@ PlaneC3::c() const template < class R > inline -typename R::FT +typename PlaneC3::FT PlaneC3::d() const { return ptr()->e3; diff --git a/Old_Packages/C3/include/CGAL/Cartesian/Point_3.C b/Old_Packages/C3/include/CGAL/Cartesian/Point_3.C index 58e29cbd054..24eccad8f65 100644 --- a/Old_Packages/C3/include/CGAL/Cartesian/Point_3.C +++ b/Old_Packages/C3/include/CGAL/Cartesian/Point_3.C @@ -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::PointC3(const PointC3 &p) : } template < class R > -PointC3::PointC3(const typename R::FT &x, - const typename R::FT &y, - const typename R::FT &z) +PointC3::PointC3(const typename PointC3::FT &x, + const typename PointC3::FT &y, + const typename PointC3::FT &z) { PTR = new _Threetuple(x, y, z); } template < class R > -PointC3::PointC3(const typename R::FT &x, - const typename R::FT &y, - const typename R::FT &z, +PointC3::PointC3(const typename PointC3::FT &x, + const typename PointC3::FT &y, + const typename PointC3::FT &z, const FT &w) { if (w != FT(1)) @@ -134,7 +135,7 @@ PointC3::id() const template < class R > inline -typename R::FT +typename PointC3::FT PointC3::x() const { return ptr()->e0; @@ -143,7 +144,7 @@ PointC3::x() const template < class R > inline -typename R::FT +typename PointC3::FT PointC3::y() const { return ptr()->e1; @@ -152,7 +153,7 @@ PointC3::y() const template < class R > inline -typename R::FT +typename PointC3::FT PointC3::z() const { return ptr()->e2; @@ -170,7 +171,7 @@ PointC3::dimension() const template < class R > inline -typename R::FT +typename PointC3::FT PointC3::cartesian(int i) const { CGAL_kernel_precondition( (i>=0) && (i<=2) ); @@ -181,7 +182,7 @@ PointC3::cartesian(int i) const template < class R > inline -typename R::FT +typename PointC3::FT PointC3::operator[](int i) const { return cartesian(i); @@ -190,7 +191,7 @@ PointC3::operator[](int i) const template < class R > inline -typename R::FT +typename PointC3::FT PointC3::hx() const { return ptr()->e0; @@ -199,7 +200,7 @@ PointC3::hx() const template < class R > inline -typename R::FT +typename PointC3::FT PointC3::hy() const { return ptr()->e1; @@ -208,7 +209,7 @@ PointC3::hy() const template < class R > inline -typename R::FT +typename PointC3::FT PointC3::hz() const { return ptr()->e2; @@ -217,14 +218,14 @@ PointC3::hz() const template < class R > inline -typename R::FT +typename PointC3::FT PointC3::hw() const { return FT(1); } template < class R > -typename R::FT +typename PointC3::FT PointC3::homogeneous(int i) const { CGAL_kernel_precondition((i>=0) && (i<=3)); diff --git a/Old_Packages/C3/include/CGAL/Cartesian/Segment_3.C b/Old_Packages/C3/include/CGAL/Cartesian/Segment_3.C index 12d9255c13e..7a212a5df29 100644 --- a/Old_Packages/C3/include/CGAL/Cartesian/Segment_3.C +++ b/Old_Packages/C3/include/CGAL/Cartesian/Segment_3.C @@ -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::operator[](int i) const template < class R > inline -typename R::FT +typename SegmentC3::FT SegmentC3::squared_length() const { return squared_distance(target(), source()); diff --git a/Old_Packages/C3/include/CGAL/Cartesian/Vector_3.C b/Old_Packages/C3/include/CGAL/Cartesian/Vector_3.C index 4ef9114d27a..0dc151b924c 100644 --- a/Old_Packages/C3/include/CGAL/Cartesian/Vector_3.C +++ b/Old_Packages/C3/include/CGAL/Cartesian/Vector_3.C @@ -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:: -VectorC3(const typename R::FT &x, - const typename R::FT &y, - const typename R::FT &z) +VectorC3(const typename VectorC3::FT &x, + const typename VectorC3::FT &y, + const typename VectorC3::FT &z) { PTR = new _Threetuple(x, y, z); } template < class R > VectorC3:: -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::FT &x, + const typename VectorC3::FT &y, + const typename VectorC3::FT &z, + const typename VectorC3::FT &w) { if (w != FT(1)) PTR = new _Threetuple(x/w, y/w, z/w); @@ -147,7 +148,7 @@ long VectorC3::id() const } template < class R > inline -typename R::FT +typename VectorC3::FT VectorC3::x() const { return ptr()->e0; @@ -155,7 +156,7 @@ VectorC3::x() const template < class R > inline -typename R::FT +typename VectorC3::FT VectorC3::y() const { return ptr()->e1; @@ -163,7 +164,7 @@ VectorC3::y() const template < class R > inline -typename R::FT +typename VectorC3::FT VectorC3::z() const { return ptr()->e2; @@ -171,7 +172,7 @@ VectorC3::z() const template < class R > inline -typename R::FT +typename VectorC3::FT VectorC3::cartesian(int i) const { CGAL_kernel_precondition( (i>=0) && (i<3) ); @@ -181,7 +182,7 @@ VectorC3::cartesian(int i) const template < class R > inline -typename R::FT +typename VectorC3::FT VectorC3::operator[](int i) const { return cartesian(i); @@ -197,7 +198,7 @@ VectorC3::dimension() const template < class R > inline -typename R::FT +typename VectorC3::FT VectorC3::hx() const { return ptr()->e0; @@ -205,7 +206,7 @@ VectorC3::hx() const template < class R > inline -typename R::FT +typename VectorC3::FT VectorC3::hy() const { return ptr()->e1; @@ -213,21 +214,21 @@ VectorC3::hy() const template < class R > inline -typename R::FT +typename VectorC3::FT VectorC3::hz() const { return ptr()->e2; } template < class R > -typename R::FT +typename VectorC3::FT VectorC3::hw() const { return FT(1); } template < class R > -typename R::FT +typename VectorC3::FT VectorC3::homogeneous(int i) const { return (i==3) ? FT(1) : cartesian(i); @@ -259,7 +260,7 @@ VectorC3 VectorC3::operator-() const template < class R > inline -typename R::FT +typename VectorC3::FT VectorC3::operator*(const VectorC3 &w) const { return x() * w.x() + y() * w.y() + z() * w.z() ; @@ -268,7 +269,7 @@ VectorC3::operator*(const VectorC3 &w) const template < class R > inline VectorC3 -VectorC3::operator/(const typename R::FT &c) const +VectorC3::operator/(const typename VectorC3::FT &c) const { return VectorC3( x()/c, y()/c, z()/c) ; } diff --git a/Old_Packages/C3/version b/Old_Packages/C3/version index 5f483937fe1..fafeecbe38b 100644 --- a/Old_Packages/C3/version +++ b/Old_Packages/C3/version @@ -1 +1 @@ -3.6.2 ( 11 Oct 1999 ) +3.6.3 ( 12 Oct 1999 )