- Remove #ifdef CGAL_CFG_TYPENAME_BUG stuff, as VC6 is not supported anymore.

This commit is contained in:
Sylvain Pion 2003-01-20 18:18:39 +00:00
parent be38256e74
commit 1a6508153d
38 changed files with 9 additions and 276 deletions

View File

@ -1,3 +1,6 @@
Version 6.71 (20 January 2003)
- Remove #ifdef CGAL_CFG_TYPENAME_BUG stuff, as VC6 is not supported anymore.
Version 6.70 (20 January 2003)
- Submission bug.

View File

@ -169,10 +169,6 @@ private:
FT t21, t22, t23;
};
#ifdef CGAL_CFG_TYPENAME_BUG
#define typename
#endif
template < class R >
CGAL_KERNEL_LARGE_INLINE
typename Aff_transformation_repC2<R>::Aff_transformation_2
@ -250,10 +246,6 @@ compose(const Scaling_repC2<R> &t) const
t.scalefactor_ * t23);
}
#ifdef CGAL_CFG_TYPENAME_BUG
#undef typename
#endif
CGAL_END_NAMESPACE
#endif // CGAL_CARTESIAN_AFF_TRANSFORMATION_REP_2_H

View File

@ -197,10 +197,6 @@ private:
FT t31, t32, t33, t34;
};
#ifdef CGAL_CFG_TYPENAME_BUG
#define typename
#endif
template < class R >
CGAL_KERNEL_LARGE_INLINE
typename Aff_transformation_repC3<R>::Aff_transformation_3
@ -310,10 +306,6 @@ Aff_transformation_repC3<R>::transpose() const
t13, t23, t33, t34);
}
#ifdef CGAL_CFG_TYPENAME_BUG
#undef typename
#endif
CGAL_END_NAMESPACE
#endif // CGAL_CARTESIAN_AFF_TRANSFORMATION_REP_3_H

View File

@ -122,10 +122,6 @@ public:
Bbox_2 bbox() const;
};
#ifdef CGAL_CFG_TYPENAME_BUG
#define typename
#endif
template < class R >
CGAL_KERNEL_INLINE
bool
@ -326,10 +322,6 @@ operator>>(std::istream &is, CircleC2<R> &c)
}
#endif // CGAL_NO_ISTREAM_EXTRACT_CIRCLEC2
#ifdef CGAL_CFG_TYPENAME_BUG
#undef typename
#endif
CGAL_END_NAMESPACE
#endif // CGAL_CARTESIAN_CIRCLE_2_H

View File

@ -95,10 +95,6 @@ public:
}
};
#ifdef CGAL_CFG_TYPENAME_BUG
#define typename
#endif
template < class R >
inline
bool
@ -248,10 +244,6 @@ operator>>(std::istream &is, DirectionC2<R> &p)
}
#endif // CGAL_NO_ISTREAM_EXTRACT_DIRECTIONC2
#ifdef CGAL_CFG_TYPENAME_BUG
#undef typename
#endif
CGAL_END_NAMESPACE
#endif // CGAL_CARTESIAN_DIRECTION_2_H

View File

@ -108,10 +108,6 @@ public:
}
};
#ifdef CGAL_CFG_TYPENAME_BUG
#define typename
#endif
template < class R >
inline
bool
@ -203,10 +199,6 @@ operator>>(std::istream &is, DirectionC3<R> &d)
}
#endif // CGAL_NO_ISTREAM_EXTRACT_DIRECTIONC3
#ifdef CGAL_CFG_TYPENAME_BUG
#undef typename
#endif
CGAL_END_NAMESPACE
#endif // CGAL_CARTESIAN_DIRECTION_3_H

View File

@ -118,10 +118,6 @@ public:
FT volume() const;
};
#ifdef CGAL_CFG_TYPENAME_BUG
#define typename
#endif
template < class R >
CGAL_KERNEL_INLINE
bool
@ -348,10 +344,6 @@ operator>>(std::istream& is, Iso_cuboidC3<R>& r)
}
#endif // CGAL_NO_ISTREAM_EXTRACT_ISO_CUBOIDC3
#ifdef CGAL_CFG_TYPENAME_BUG
#undef typename
#endif
CGAL_END_NAMESPACE
#endif // CGAL_CARTESIAN_ISO_CUBOID_3_H

View File

@ -114,10 +114,6 @@ public:
FT area() const;
};
#ifdef CGAL_CFG_TYPENAME_BUG
#define typename
#endif
template < class R >
inline
bool
@ -322,10 +318,6 @@ operator>>(std::istream &is, Iso_rectangleC2<R> &r)
}
#endif // CGAL_NO_ISTREAM_EXTRACT_ISO_RECTANGLEC2
#ifdef CGAL_CFG_TYPENAME_BUG
#undef typename
#endif
CGAL_END_NAMESPACE
#endif // CGAL_CARTESIAN_ISO_RECTANGLE_2_H

View File

@ -108,10 +108,6 @@ public:
}
};
#ifdef CGAL_CFG_TYPENAME_BUG
#define typename
#endif
template < class R >
CGAL_KERNEL_INLINE
bool
@ -306,10 +302,6 @@ operator>>(std::istream &is, LineC2<R> &l)
}
#endif // CGAL_NO_ISTREAM_EXTRACT_LINEC2
#ifdef CGAL_CFG_TYPENAME_BUG
#undef typename
#endif
CGAL_END_NAMESPACE
#endif // CGAL_CARTESIAN_LINE_2_H

View File

@ -91,10 +91,6 @@ public:
}
};
#ifdef CGAL_CFG_TYPENAME_BUG
#define typename
#endif
template < class R >
inline
bool
@ -193,10 +189,6 @@ operator>>(std::istream &is, LineC3<R> &l)
}
#endif // CGAL_CARTESIAN_NO_ISTREAM_EXTRACT_LINEC3
#ifdef CGAL_CFG_TYPENAME_BUG
#undef typename
#endif
CGAL_END_NAMESPACE
#endif // CGAL_CARTESIAN_LINE_3_H

View File

@ -147,10 +147,6 @@ public:
bool is_degenerate() const;
};
#ifdef CGAL_CFG_TYPENAME_BUG
#define typename
#endif
template < class R >
CGAL_KERNEL_INLINE
bool
@ -363,10 +359,6 @@ operator>>(std::istream &is, PlaneC3<R> &p)
}
#endif // CGAL_NO_ISTREAM_EXTRACT_PLANEC3
#ifdef CGAL_CFG_TYPENAME_BUG
#undef typename
#endif
CGAL_END_NAMESPACE
#endif // CGAL_CARTESIAN_PLANE_3_H

View File

@ -117,10 +117,6 @@ public:
}
};
#ifdef CGAL_CFG_TYPENAME_BUG
#define typename
#endif
template < class R >
CGAL_KERNEL_INLINE
const typename PointC2<R>::FT &
@ -194,10 +190,6 @@ operator>>(std::istream &is, PointC2<R> &p)
}
#endif // CGAL_NO_ISTREAM_EXTRACT_POINTC2
#ifdef CGAL_CFG_TYPENAME_BUG
#undef typename
#endif
CGAL_END_NAMESPACE
#endif // CGAL_CARTESIAN_POINT_2_H

View File

@ -120,10 +120,6 @@ public:
}
};
#ifdef CGAL_CFG_TYPENAME_BUG
#define typename
#endif
template < class R >
inline
const typename PointC3<R>::FT &
@ -212,10 +208,6 @@ operator>>(std::istream &is, PointC3<R> &p)
}
#endif // CGAL_CARTESIAN_NO_ISTREAM_EXTRACT_POINTC3
#ifdef CGAL_CFG_TYPENAME_BUG
#undef typename
#endif
CGAL_END_NAMESPACE
#endif // CGAL_CARTESIAN_POINT_3_H

View File

@ -83,10 +83,6 @@ public:
bool collinear_has_on(const Point_2 &p) const;
};
#ifdef CGAL_CFG_TYPENAME_BUG
#define typename
#endif
template < class R >
CGAL_KERNEL_INLINE
bool
@ -234,10 +230,6 @@ operator>>(std::istream &is, RayC2<R> &r)
}
#endif // CGAL_NO_ISTREAM_EXTRACT_RAYC2
#ifdef CGAL_CFG_TYPENAME_BUG
#undef typename
#endif
CGAL_END_NAMESPACE
#endif // CGAL_CARTESIAN_RAY_2_H

View File

@ -81,10 +81,6 @@ public:
bool collinear_has_on(const Point_3 &p) const;
};
#ifdef CGAL_CFG_TYPENAME_BUG
#define typename
#endif
template < class R >
inline
bool
@ -219,10 +215,6 @@ operator>>(std::istream &is, RayC3<R> &r)
}
#endif // CGAL_NO_ISTREAM_EXTRACT_RAYC3
#ifdef CGAL_CFG_TYPENAME_BUG
#undef typename
#endif
CGAL_END_NAMESPACE
#endif // CGAL_CARTESIAN_RAY_3_H

View File

@ -91,10 +91,6 @@ public:
Bbox_2 bbox() const;
};
#ifdef CGAL_CFG_TYPENAME_BUG
#define typename
#endif
template < class R >
inline
bool
@ -282,10 +278,6 @@ operator>>(std::istream &is, SegmentC2<R> &s)
}
#endif // CGAL_NO_ISTREAM_EXTRACT_SEGMENTC2
#ifdef CGAL_CFG_TYPENAME_BUG
#undef typename
#endif
CGAL_END_NAMESPACE
#endif // CGAL_CARTESIAN_SEGMENT_2_H

View File

@ -88,10 +88,6 @@ public:
Bbox_3 bbox() const;
};
#ifdef CGAL_CFG_TYPENAME_BUG
#define typename
#endif
template < class R >
inline
bool
@ -263,10 +259,6 @@ operator>>(std::istream &is, SegmentC3<R> &s)
}
#endif // CGAL_NO_ISTREAM_EXTRACT_SEGMENTC3
#ifdef CGAL_CFG_TYPENAME_BUG
#undef typename
#endif
CGAL_END_NAMESPACE
#endif // CGAL_CARTESIAN_SEGMENT_3_H

View File

@ -153,10 +153,6 @@ public:
Bbox_3 bbox() const;
};
#ifdef CGAL_CFG_TYPENAME_BUG
#define typename
#endif
template < class R >
CGAL_KERNEL_INLINE
bool
@ -370,10 +366,6 @@ operator>>(std::istream &is, SphereC3<R> &c)
}
#endif // CGAL_NO_ISTREAM_EXTRACT_SPHEREC3
#ifdef CGAL_CFG_TYPENAME_BUG
#undef typename
#endif
CGAL_END_NAMESPACE
#endif // CGAL_CARTESIAN_SPHERE_3_H

View File

@ -84,10 +84,6 @@ public:
FT volume() const;
};
#ifdef CGAL_CFG_TYPENAME_BUG
#define typename
#endif
template < class R >
bool
TetrahedronC3<R>::
@ -299,10 +295,6 @@ operator>>(std::istream &is, TetrahedronC3<R> &t)
}
#endif // CGAL_NO_ISTREAM_EXTRACT_TETRAHEDRONC3
#ifdef CGAL_CFG_TYPENAME_BUG
#undef typename
#endif
CGAL_END_NAMESPACE
#endif // CGAL_CARTESIAN_TETRAHEDRON_3_H

View File

@ -83,10 +83,6 @@ public:
FT area() const;
};
#ifdef CGAL_CFG_TYPENAME_BUG
#define typename
#endif
template < class R >
CGAL_KERNEL_MEDIUM_INLINE
bool
@ -298,10 +294,6 @@ operator>>(std::istream &is, TriangleC2<R> &t)
}
#endif // CGAL_NO_ISTREAM_EXTRACT_TRIANGLEC2
#ifdef CGAL_CFG_TYPENAME_BUG
#undef typename
#endif
CGAL_END_NAMESPACE
#endif // CGAL_CARTESIAN_TRIANGLE_2_H

View File

@ -73,10 +73,6 @@ public:
FT squared_area() const;
};
#ifdef CGAL_CFG_TYPENAME_BUG
#define typename
#endif
template < class R >
bool
TriangleC3<R>::operator==(const TriangleC3<R> &t) const
@ -200,10 +196,6 @@ operator>>(std::istream &is, TriangleC3<R> &t)
}
#endif // CGAL_NO_ISTREAM_EXTRACT_TRIANGLEC3
#ifdef CGAL_CFG_TYPENAME_BUG
#undef typename
#endif
CGAL_END_NAMESPACE
#endif // CGAL_CARTESIAN_TRIANGLE_3_H

View File

@ -121,10 +121,6 @@ public:
}
};
#ifdef CGAL_CFG_TYPENAME_BUG
#define typename
#endif
template < class R >
CGAL_KERNEL_INLINE
bool
@ -296,10 +292,6 @@ operator>>(std::istream &is, VectorC2<R> &p)
}
#endif // CGAL_NO_ISTREAM_EXTRACT_VECTORC2
#ifdef CGAL_CFG_TYPENAME_BUG
#undef typename
#endif
CGAL_END_NAMESPACE
#endif // CGAL_CARTESIAN_VECTOR_2_H

View File

@ -128,10 +128,6 @@ public:
}
};
#ifdef CGAL_CFG_TYPENAME_BUG
#define typename
#endif
template < class R >
inline
bool
@ -298,10 +294,6 @@ operator>>(std::istream &is, VectorC3<R> &p)
}
#endif // CGAL_CARTESIAN_NO_ISTREAM_EXTRACT_VECTORC3
#ifdef CGAL_CFG_TYPENAME_BUG
#undef typename
#endif
CGAL_END_NAMESPACE
#endif // CGAL_CARTESIAN_VECTOR_3_H

View File

@ -1,3 +1,6 @@
2.74 (20 Jan 2003)
- Remove #ifdef CGAL_CFG_TYPENAME_BUG stuff, as VC6 is not supported anymore.
2.73 (20 Jan 2003)
- Remove *handle_[23] types from the main kernel classes.

View File

@ -603,10 +603,6 @@ public:
};
#ifdef CGAL_CFG_TYPENAME_BUG
#define typename
#endif
template < class R >
Aff_transformationH2<R>::Aff_transformationH2()
{ initialize_with(Aff_transformation_repH2<R>()); }
@ -1055,10 +1051,6 @@ cartesian(int i, int j) const
return FT(0);
}
#ifdef CGAL_CFG_TYPENAME_BUG
#undef typename
#endif
CGAL_END_NAMESPACE
#endif // CGAL_AFF_TRANSFORMATIONH2_H

View File

@ -119,10 +119,6 @@ public:
// bool unoriented_equal( const CircleH2<R>& ) const;
};
#ifdef CGAL_CFG_TYPENAME_BUG
#define typename
#endif
template <class R>
inline
const typename CircleH2<R>::Point_2 &
@ -383,10 +379,6 @@ std::istream& operator>>(std::istream &is, CircleH2<R> &c)
}
#endif // CGAL_NO_ISTREAM_EXTRACT_CIRCLEH2
#ifdef CGAL_CFG_TYPENAME_BUG
#undef typename
#endif
CGAL_END_NAMESPACE
#endif // CGAL_CIRCLEH2_H

View File

@ -106,10 +106,6 @@ public:
DirectionH2<R> transform(const Aff_transformation_2 &) const;
};
#ifdef CGAL_CFG_TYPENAME_BUG
#define typename
#endif
template <class R >
CGAL_KERNEL_INLINE
bool
@ -143,10 +139,6 @@ DirectionH2<R>::delta(int i) const
return dy();
}
#ifdef CGAL_CFG_TYPENAME_BUG
#undef typename
#endif
CGAL_END_NAMESPACE
#include <CGAL/Homogeneous/predicates_on_directionsH2.h>

View File

@ -83,10 +83,6 @@ public:
LineH2<R> transform(const Aff_transformation_2&) const;
};
#ifdef CGAL_CFG_TYPENAME_BUG
#define typename
#endif
template < class R >
CGAL_KERNEL_INLINE
LineH2<R>::LineH2()
@ -390,10 +386,6 @@ bool
LineH2<R>::operator!=(const LineH2<R>& l) const
{ return !(*this == l); }
#ifdef CGAL_CFG_TYPENAME_BUG
#undef typename
#endif
CGAL_END_NAMESPACE
#endif // CGAL_LINEH2_H

View File

@ -90,10 +90,6 @@ public:
Direction_2 direction() const;
};
#ifdef CGAL_CFG_TYPENAME_BUG
#define typename
#endif
template < class R >
CGAL_KERNEL_INLINE
bool
@ -153,10 +149,6 @@ PointH2<R>::direction() const
{ return typename PointH2<R>::Direction_2(*this); }
#ifdef CGAL_CFG_TYPENAME_BUG
#undef typename
#endif
template < class R >
CGAL_KERNEL_MEDIUM_INLINE
Bbox_2

View File

@ -88,10 +88,6 @@ public:
SegmentH2<R> transform( const Aff_transformation_2 & t) const;
};
#ifdef CGAL_CFG_TYPENAME_BUG
#define typename
#endif
template < class R >
inline
const typename SegmentH2<R>::Point_2 &
@ -298,10 +294,6 @@ bool
SegmentH2<R>::operator!=(const SegmentH2<R>& s) const
{ return ( !operator==(s) ); }
#ifdef CGAL_CFG_TYPENAME_BUG
#undef typename
#endif
CGAL_END_NAMESPACE
#endif // CGAL_SEGMENTH2_H

View File

@ -78,10 +78,6 @@ public:
FT area() const;
};
#ifdef CGAL_CFG_TYPENAME_BUG
#define typename
#endif
template <class R>
CGAL_KERNEL_INLINE
const typename TriangleH2<R>::Point_2 &
@ -327,10 +323,6 @@ operator>>(std::istream &is, TriangleH2<R> &t)
}
#endif // CGAL_NO_ISTREAM_EXTRACT_TRIANGLEH2
#ifdef CGAL_CFG_TYPENAME_BUG
#undef typename
#endif
CGAL_END_NAMESPACE
#endif // CGAL_TRIANGLEH2_H

View File

@ -106,10 +106,6 @@ public:
: base ( p) {}
};
#ifdef CGAL_CFG_TYPENAME_BUG
#define typename
#endif
template < class R >
inline
bool
@ -331,10 +327,6 @@ operator-(const PointH2<R>& p, const PointH2<R>& q)
p.hw()*q.hw() );
}
#ifdef CGAL_CFG_TYPENAME_BUG
#undef typename
#endif
template < class R >
CGAL_KERNEL_INLINE
typename VectorH2<R>::Vector_2

View File

@ -1,3 +1,6 @@
2.53 (20 January 2003)
- Remove #ifdef CGAL_CFG_TYPENAME_BUG stuff, as VC6 is not supported anymore.
2.52 (20 January 2003)
- Remove *handle_[23] types from the main kernel classes.

View File

@ -356,10 +356,6 @@ public:
{ return Ptr()->homogeneous(i,j); }
};
#ifdef CGAL_CFG_TYPENAME_BUG
#define typename
#endif
template < class R >
CGAL_KERNEL_INLINE
Aff_transformation_repH3<R>::Aff_transformation_repH3(
@ -889,10 +885,6 @@ operator<< ( std::ostream & out,
<< "| "<< RT0 <<' '<< RT0 <<' '<< RT0 <<' '<< r.t33 << " |\n";
}
#ifdef CGAL_CFG_TYPENAME_BUG
#undef typename
#endif
CGAL_END_NAMESPACE
#endif // CGAL_AFF_TRANSFORMATIONH3_H

View File

@ -101,10 +101,6 @@ public:
const RT & delta(int i) const;
};
#ifdef CGAL_CFG_TYPENAME_BUG
#define typename
#endif
template <class R >
CGAL_KERNEL_INLINE
const typename DirectionH3<R>::RT &
@ -163,10 +159,6 @@ cross_product( const DirectionH3<R>& d1,
const DirectionH3<R>& d2)
{ return cross_product(d1.to_vector(),d2.to_vector()).direction(); }
#ifdef CGAL_CFG_TYPENAME_BUG
#undef typename
#endif
template <class R >
inline
DirectionH3<R>

View File

@ -87,10 +87,6 @@ bool
LineH3<R>::operator!=(const LineH3<R>& l) const
{ return !(*this == l); }
#ifdef CGAL_CFG_TYPENAME_BUG
#define typename
#endif
template < class R >
inline
const typename LineH3<R>::Point_3 &
@ -202,10 +198,6 @@ LineH3<R>::operator==(const LineH3<R>& l) const
return l.direction() == direction() && l.has_on( point() );
}
#ifdef CGAL_CFG_TYPENAME_BUG
#undef typename
#endif
CGAL_END_NAMESPACE
#endif // CGAL_LINEH3_H

View File

@ -91,10 +91,6 @@ public:
};
#ifdef CGAL_CFG_TYPENAME_BUG
#define typename
#endif
template < class R >
inline
const typename PointH3<R>::RT &

View File

@ -109,10 +109,6 @@ VectorH3<R>::VectorH3(const RT& x, const RT& y, const RT& z, const RT& w)
}
#ifdef CGAL_CFG_TYPENAME_BUG
#define typename
#endif
template < class R >
CGAL_KERNEL_INLINE
typename VectorH3<R>::FT
@ -311,10 +307,6 @@ operator-(const PointH3<R>& p, const PointH3<R>& q)
p.hw()*q.hw() );
}
#ifdef CGAL_CFG_TYPENAME_BUG
#undef typename
#endif
template < class R >
inline
typename VectorH3<R>::Vector_3