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

Remove the casting of surfac-sweep object

This commit is contained in:
Efi Fogel 2017-06-15 23:38:42 +03:00
parent ae01194712
commit 930c79d58e
2 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Surface_sweep_2/include/CGAL/Surface_sweep_2/Surface_sweep_2_visitors.h
View File

@ -67,7 +67,7 @@ public:
typedef typename Gt2::X_monotone_curve_2 X_monotone_curve_2; typedef typename Gt2::X_monotone_curve_2 X_monotone_curve_2;
typedef typename Gt2::Point_2 Point_2; typedef typename Gt2::Point_2 Point_2;
typedef CGAL::Surface_sweep_2::Surface_sweep_2<Self> Surface_sweep_2; typedef typename Base::Surface_sweep_2 Surface_sweep_2;
protected: protected:
Output_ierator m_out; // The output points. Output_ierator m_out; // The output points.
@ -92,9 +92,7 @@ public:
this->traits()); this->traits());
//Perform the sweep //Perform the sweep
Surface_sweep_2* sl = Surface_sweep_2* sl = this->surface_sweep();
reinterpret_cast<Surface_sweep_2*>(this->surface_sweep());
sl->sweep(curves_vec.begin(), curves_vec.end(), sl->sweep(curves_vec.begin(), curves_vec.end(),
points_vec.begin(), points_vec.end()); points_vec.begin(), points_vec.end());
} }
@ -146,7 +144,7 @@ public:
typedef typename Subcurve::Status_line_iterator Status_line_iterator; typedef typename Subcurve::Status_line_iterator Status_line_iterator;
typedef CGAL::Surface_sweep_2::Surface_sweep_2<Self> Surface_sweep_2; typedef typename Base::Surface_sweep_2 Surface_sweep_2;
protected: protected:
// Data members: // Data members:
@ -172,9 +170,7 @@ public:
this->traits()); this->traits());
// Perform the sweep. // Perform the sweep.
Surface_sweep_2* sl = Surface_sweep_2* sl = this->surface_sweep();
reinterpret_cast<Surface_sweep_2*>(this->surface_sweep());
sl->sweep(curves_vec.begin(), curves_vec.end(), sl->sweep(curves_vec.begin(), curves_vec.end(),
points_vec.begin(), points_vec.end()); points_vec.begin(), points_vec.end());
} }
@ -225,7 +221,7 @@ public:
typedef typename Gt2::X_monotone_curve_2 X_monotone_curve_2; typedef typename Gt2::X_monotone_curve_2 X_monotone_curve_2;
typedef typename Gt2::Point_2 Point_2; typedef typename Gt2::Point_2 Point_2;
typedef CGAL::Surface_sweep_2::Surface_sweep_2<Self> Surface_sweep_2; typedef typename Base::Surface_sweep_2 Surface_sweep_2;
protected: protected:
// Data members: // Data members:
@ -247,9 +243,7 @@ public:
this-> traits()); this-> traits());
// Perform the sweep. // Perform the sweep.
Surface_sweep_2* sl = Surface_sweep_2* sl = this->surface_sweep();
reinterpret_cast<Surface_sweep_2*>(this->surface_sweep());
sl->sweep(curves_vec.begin(), curves_vec.end(), sl->sweep(curves_vec.begin(), curves_vec.end(),
points_vec.begin(), points_vec.end()); points_vec.begin(), points_vec.end());
} }
@ -286,8 +280,7 @@ public:
void sweep_xcurves(XCurveIterator begin, XCurveIterator end) void sweep_xcurves(XCurveIterator begin, XCurveIterator end)
{ {
// Perform the sweep. // Perform the sweep.
Surface_sweep_2* sl = Surface_sweep_2* sl = this->surface_sweep();
reinterpret_cast<Surface_sweep_2*>(this->surface_sweep());
sl->sweep(begin, end); sl->sweep(begin, end);
} }
@ -301,8 +294,7 @@ public:
bool /* flag */) bool /* flag */)
{ {
if (m_found_x) { if (m_found_x) {
Surface_sweep_2* sl = Surface_sweep_2* sl = this->surface_sweep();
reinterpret_cast<Surface_sweep_2*>(this->surface_sweep());
sl->stop_sweep(); sl->stop_sweep();
} }
return true; return true;

3
Surface_sweep_2/include/CGAL/Surface_sweep_2/Visitor.h
View File

@ -76,8 +76,7 @@ public:
virtual ~Visitor_base() {} virtual ~Visitor_base() {}
/*! Attach the a sweep-line object. */ /*! Attach the a sweep-line object. */
void attach(const Surface_sweep_2* sl) void attach(Surface_sweep_2* sl) { m_surface_sweep = sl; }
{ m_surface_sweep = (Surface_sweep_2*)(sl); }
/*! /*!
* A notification invoked before the sweep-line starts handling the given * A notification invoked before the sweep-line starts handling the given