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

BUGFIX: 

revert parts of modifications done in r58343, r58233, r58232
  The constness problem fixed by the aforementioned modifications
  was induced by a non-used function that I commented.
This commit is contained in:
Sébastien Loriot 2011-06-01 13:47:17 +00:00
parent 813c75036c
commit 1d2c334e61
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Nef_S2/include/CGAL/Nef_S2/SM_point_locator.h
View File

@ -92,9 +92,8 @@ public:
typedef typename Decorator_traits::SVertex_handle SVertex_handle; typedef typename Decorator_traits::SVertex_handle SVertex_handle;
typedef typename Decorator_traits::SHalfedge_handle SHalfedge_handle; typedef typename Decorator_traits::SHalfedge_handle SHalfedge_handle;
typedef typename Decorator_traits::SHalfloop_handle SHalfloop_handle; typedef typename Decorator_traits::SHalfloop_handle SHalfloop_handle;
typedef typename Decorator_traits::SHalfloop_const_handle SHalfloop_const_handle;
typedef typename Decorator_traits::SFace_handle SFace_handle; typedef typename Decorator_traits::SFace_handle SFace_handle;
typedef typename Decorator_traits::SFace_const_handle SFace_const_handle;
typedef typename Decorator_traits::SVertex_iterator SVertex_iterator; typedef typename Decorator_traits::SVertex_iterator SVertex_iterator;
typedef typename Decorator_traits::SHalfedge_iterator SHalfedge_iterator; typedef typename Decorator_traits::SHalfedge_iterator SHalfedge_iterator;
@ -182,7 +181,7 @@ public:
enum SOLUTION { is_vertex_, is_edge_, is_loop_ }; enum SOLUTION { is_vertex_, is_edge_, is_loop_ };
// enumeration for internal use // enumeration for internal use
Object_handle locate(const Sphere_point& p, bool skipVEL = false) const Object_handle locate(const Sphere_point& p, bool skipVEL = false)
/*{\Mop returns a generic handle |h| to an object (vertex, halfedge, /*{\Mop returns a generic handle |h| to an object (vertex, halfedge,
face) of the underlying plane map |P| which contains the point |p = face) of the underlying plane map |P| which contains the point |p =
s.source()| in its relative interior. |s.target()| must be a point s.source()| in its relative interior. |s.target()| must be a point
@ -209,7 +208,7 @@ public:
if ( this->has_shalfloop() && this->shalfloop()->circle().has_on(p)) { if ( this->has_shalfloop() && this->shalfloop()->circle().has_on(p)) {
CGAL_NEF_TRACEN( " on loop"); CGAL_NEF_TRACEN( " on loop");
return make_object(SHalfloop_const_handle(this->shalfloop())); return make_object(SHalfloop_handle(this->shalfloop()));
} }
} }
@ -224,7 +223,7 @@ public:
SVertex_handle v_res; SVertex_handle v_res;
SHalfedge_handle e_res; SHalfedge_handle e_res;
SHalfloop_const_handle l_res(this->shalfloop()); SHalfloop_handle l_res(this->shalfloop());
SOLUTION solution; SOLUTION solution;
CGAL_NEF_TRACEN(" on face..."); CGAL_NEF_TRACEN(" on face...");
@ -312,7 +311,7 @@ public:
case is_edge_: case is_edge_:
return make_object(SFace_handle(e_res->incident_sface())); return make_object(SFace_handle(e_res->incident_sface()));
case is_loop_: case is_loop_:
return make_object(SFace_const_handle(l_res->incident_sface())); return make_object(SFace_handle(l_res->incident_sface()));
case is_vertex_: case is_vertex_:
return make_object(SFace_handle(v_res->incident_sface())); return make_object(SFace_handle(v_res->incident_sface()));
default: CGAL_error_msg("missing solution."); default: CGAL_error_msg("missing solution.");
@ -320,6 +319,7 @@ public:
return Object_handle(); // never reached! return Object_handle(); // never reached!
} }
#if 0 //THIS CODE DOES NOT SEEM TO BE USED
template <typename Object_predicate> template <typename Object_predicate>
Object_handle ray_shoot(const Sphere_point& p, Object_handle ray_shoot(const Sphere_point& p,
const Sphere_direction& d, const Sphere_direction& d,
@ -336,7 +336,7 @@ public:
{ {
Sphere_circle c(d.circle()); Sphere_circle c(d.circle());
Sphere_segment s; Sphere_segment s;
Object_handle h = this->locate(p); Object_handle h = locate(p);
SVertex_handle v; SVertex_handle v;
SHalfedge_handle e; SHalfedge_handle e;
SHalfloop_handle l; SHalfloop_handle l;
@ -404,6 +404,7 @@ public:
CGAL_error_msg("not yet correct"); CGAL_error_msg("not yet correct");
return h; return h;
} }
#endif
Object_handle ray_shoot(const Sphere_point& p, Object_handle ray_shoot(const Sphere_point& p,
const Sphere_circle& c, const Sphere_circle& c,