songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

change Curve_pair to Curve_pair_ and Compare_events to Compare_events_

This commit is contained in:
Shlomo Golubev 2007-08-28 14:07:56 +00:00
parent c3ecdc781c
commit 93011c08b4
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Arrangement_on_surface_2/include/CGAL/Basic_sweep_line_2.h
View File

@ -96,7 +96,7 @@ public:
typedef typename Traits_adaptor_2::Has_boundary_category
Has_boundary_category;
typedef Compare_events<Traits_adaptor_2, Event> Compare_events;
typedef Compare_events_<Traits_adaptor_2, Event> Compare_events;
typedef Multiset<Event*, Compare_events, Allocator> Event_queue;
typedef typename Event_queue::iterator Event_queue_iterator;

2
Arrangement_on_surface_2/include/CGAL/Sweep_line_2.h
View File

@ -113,7 +113,7 @@ public:
typedef typename Base::Status_line_iterator Status_line_iterator;
typedef Curve_pair<Subcurve> Curve_pair;
typedef Curve_pair_<Subcurve> Curve_pair;
typedef Curve_pair_hasher<Subcurve> Curve_pair_hasher;
typedef Equal_curve_pair<Subcurve> Equal_curve_pair;
typedef Open_hash<Curve_pair,

12
Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_curve_pair.h
View File

@ -31,7 +31,7 @@ CGAL_BEGIN_NAMESPACE
* A pair of subcurves.
*/
template <class Subcurve_>
class Curve_pair
class Curve_pair_
{
public:
@ -45,10 +45,10 @@ private:
public:
/*! Default constructor. */
Curve_pair(){}
Curve_pair_(){}
/*! Constructor from two subcurves. */
Curve_pair (Subcurve *sc1, Subcurve *sc2)
Curve_pair_ (Subcurve *sc1, Subcurve *sc2)
{
// The smallest pointer will be the first.
if(sc1 < sc2)
@ -77,7 +77,7 @@ template <class Subcurve_>
struct Less_curve_pair
{
typedef Subcurve_ Subcurve;
typedef Curve_pair<Subcurve> Curve_pair;
typedef Curve_pair_<Subcurve> Curve_pair;
bool operator() (const Curve_pair& pair1, const Curve_pair& pair2) const
{
@ -98,7 +98,7 @@ template <class Subcurve_>
struct Curve_pair_hasher
{
typedef Subcurve_ Subcurve;
typedef Curve_pair<Subcurve> Curve_pair;
typedef Curve_pair_<Subcurve> Curve_pair;
size_t operator() (const Curve_pair& pair) const
{
@ -117,7 +117,7 @@ template <class Subcurve_>
struct Equal_curve_pair
{
typedef Subcurve_ Subcurve;
typedef Curve_pair<Subcurve> Curve_pair;
typedef Curve_pair_<Subcurve> Curve_pair;
bool operator() (const Curve_pair& pair1, const Curve_pair& pair2) const
{

4
Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_functors.h
View File

@ -39,7 +39,7 @@ CGAL_BEGIN_NAMESPACE
* in the sweep-line algorithm.
*/
template <class Traits_, class Event_>
class Compare_events
class Compare_events_
{
public:
@ -62,7 +62,7 @@ private:
public:
/*! Cosntructor. */
Compare_events (Traits_2 *traits) :
Compare_events_ (Traits_2 *traits) :
m_traits (traits)
{}