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

Add 'using' for ansi compliance

This commit is contained in:
Andreas Fabri 2010-05-17 10:30:22 +00:00
parent 12619999c0
commit 033b381585
8 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Nef_3/include/CGAL/Nef_3/SNC_FM_decorator.h
View File

@ -346,7 +346,7 @@ public:
typedef CGAL::Halffacet_geometry<Point_3,Plane_3,Vertex_handle> typedef CGAL::Halffacet_geometry<Point_3,Plane_3,Vertex_handle>
Halffacet_geometry; Halffacet_geometry;
using Base::debug; using Base::link_as_facet_cycle; using Base::info; using Base::link_as_interior_loop;
protected: protected:
Halffacet_handle f_; Halffacet_handle f_;
public: public:

18
Nef_3/include/CGAL/Nef_3/SNC_SM_overlayer.h
View File

@ -223,6 +223,24 @@ class SNC_SM_overlayer<SNC_indexed_items, SM_decorator_>
typedef typename Map::Infi_box Infi_box; typedef typename Map::Infi_box Infi_box;
using SM_decorator::clear_face_cycle_entries;
using SM_decorator::link_as_loop;
using SM_decorator::link_as_prev_next_pair;
using SM_decorator::is_closed_at_source;
using SM_decorator::is_closed_at_target;
using SM_decorator::delete_edge_pair;
using SM_decorator::set_face;
using SM_decorator::is_isolated;
using SM_decorator::delete_vertex_only;
using SM_decorator::delete_face_only;
using SM_decorator::first_out_edge;
using SM_decorator::set_first_out_edge;
using SM_decorator::has_outdeg_two;
using SM_decorator::store_sm_boundary_object;
using SM_decorator::is_sm_boundary_object;
using SM_decorator::undo_sm_boundary_object;
using SM_decorator::delete_edge_pair_only;
public: public:
SNC_SM_overlayer(Map* M, SNC_SM_overlayer(Map* M,
const Sphere_kernel& G = Sphere_kernel()) const Sphere_kernel& G = Sphere_kernel())

2
Nef_3/include/CGAL/Nef_3/SNC_constructor.h
View File

@ -1858,6 +1858,8 @@ class SNC_constructor<SNC_indexed_items, SNC_structure_>
typedef typename SNC_structure::Mark Mark; typedef typename SNC_structure::Mark Mark;
using Base::create_from_plane;
public: public:
SNC_constructor( SNC_structure& W) : Base(W) {} SNC_constructor( SNC_structure& W) : Base(W) {}

8
Nef_3/include/CGAL/Nef_3/SNC_external_structure.h
View File

@ -387,7 +387,7 @@ public:
Halfedge_handle e2 = *itl; Halfedge_handle e2 = *itl;
while(normalized(e1->vector()) != normalized(-e2->vector())) { while(normalized(e1->vector()) != normalized(-e2->vector())) {
++itl; ++itl;
make_twins(e1,*itl); this->make_twins(e1,*itl);
e1 = e2; e1 = e2;
++itl; ++itl;
e2 = *itl; e2 = *itl;
@ -395,7 +395,7 @@ public:
CGAL_NEF_TRACEN(" " << e1->source()->point() CGAL_NEF_TRACEN(" " << e1->source()->point()
<< " -> " << e2->source()->point()); << " -> " << e2->source()->point());
CGAL_NEF_TRACEN(e1->vector()<<" -> "<<-e2->vector()); CGAL_NEF_TRACEN(e1->vector()<<" -> "<<-e2->vector());
make_twins(e1,e2); this->make_twins(e1,e2);
CGAL_assertion(e1->mark()==e2->mark()); CGAL_assertion(e1->mark()==e2->mark());
// discard temporary sphere_point ? // discard temporary sphere_point ?
@ -414,7 +414,7 @@ public:
Halfedge_handle e2 = *itl; Halfedge_handle e2 = *itl;
while(normalized(e1->vector()) != normalized(-e2->vector())) { while(normalized(e1->vector()) != normalized(-e2->vector())) {
++itl; ++itl;
make_twins(e1,*itl); this->make_twins(e1,*itl);
e1 = e2; e1 = e2;
++itl; ++itl;
e2 = *itl; e2 = *itl;
@ -422,7 +422,7 @@ public:
CGAL_NEF_TRACEN(" " << e1->source()->point() CGAL_NEF_TRACEN(" " << e1->source()->point()
<< " -> " << e2->source()->point()); << " -> " << e2->source()->point());
CGAL_NEF_TRACEN(e1->vector()<<" -> "<<-e2->vector()); CGAL_NEF_TRACEN(e1->vector()<<" -> "<<-e2->vector());
make_twins(e1,e2); this->make_twins(e1,e2);
CGAL_assertion(e1->mark()==e2->mark()); CGAL_assertion(e1->mark()==e2->mark());
// discard temporary sphere_point ? // discard temporary sphere_point ?

7
Nef_3/include/CGAL/Nef_3/SNC_point_locator.h
View File

@ -66,6 +66,7 @@ class SNC_point_locator
{ {
public: public:
class Intersection_call_back; class Intersection_call_back;
typedef SNC_decorator Base;
typedef SNC_point_locator<SNC_decorator> Self; typedef SNC_point_locator<SNC_decorator> Self;
typedef typename SNC_decorator::Decorator_traits Decorator_traits; typedef typename SNC_decorator::Decorator_traits Decorator_traits;
typedef typename SNC_decorator::SNC_structure SNC_structure; typedef typename SNC_decorator::SNC_structure SNC_structure;
@ -92,6 +93,7 @@ public:
typedef typename Decorator_traits::Halfedge_iterator Halfedge_iterator; typedef typename Decorator_traits::Halfedge_iterator Halfedge_iterator;
typedef typename Decorator_traits::Halffacet_iterator Halffacet_iterator; typedef typename Decorator_traits::Halffacet_iterator Halffacet_iterator;
const char* version() { return version_; } const char* version() { return version_; }
virtual Object_handle locate(const Point_3& p) const = 0; virtual Object_handle locate(const Point_3& p) const = 0;
@ -214,6 +216,7 @@ public:
// typedef typename SNC_candidate_provider::Objects_around_box Objects_around_box; // typedef typename SNC_candidate_provider::Objects_around_box Objects_around_box;
using Base::get_visible_facet;
public: public:
SNC_point_locator_by_spatial_subdivision() : SNC_point_locator_by_spatial_subdivision() :
initialized(false), candidate_provider(0) {} initialized(false), candidate_provider(0) {}
@ -305,7 +308,7 @@ public:
virtual void initialize(SNC_structure* W) { virtual void initialize(SNC_structure* W) {
#ifdef CGAL_NEF_LIST_OF_TRIANGLES #ifdef CGAL_NEF_LIST_OF_TRIANGLES
set_snc(*W); this->set_snc(*W);
candidate_provider = new SNC_candidate_provider(W); candidate_provider = new SNC_candidate_provider(W);
#else // CGAL_NEF_LIST_OF_TRIANGLES #else // CGAL_NEF_LIST_OF_TRIANGLES
CGAL_NEF_TIMER(ct_t.start()); CGAL_NEF_TIMER(ct_t.start());
@ -317,7 +320,7 @@ public:
#endif #endif
CGAL_assertion( W != NULL); CGAL_assertion( W != NULL);
// (Base) *this = SNC_decorator(*W); // (Base) *this = SNC_decorator(*W);
set_snc(*W); this->set_snc(*W);
Object_list objects; Object_list objects;
Vertex_iterator v; Vertex_iterator v;
Halfedge_iterator e; Halfedge_iterator e;

2
Nef_3/include/CGAL/Nef_3/SNC_simplify.h
View File

@ -697,6 +697,8 @@ class SNC_simplify<SNC_indexed_items, SNC_structure>
typedef typename SNC_structure::SHalfedge_around_facet_circulator typedef typename SNC_structure::SHalfedge_around_facet_circulator
SHalfedge_around_facet_circulator; SHalfedge_around_facet_circulator;
using Base::is_part_of_edge;
public: public:
SNC_simplify(SNC_structure& sncs) : Base(sncs) {} SNC_simplify(SNC_structure& sncs) : Base(sncs) {}

6
Nef_3/include/CGAL/Nef_3/SNC_sphere_map.h
View File

@ -134,7 +134,7 @@ class SNC_sphere_map : public Items_::template Vertex<SNC_structure<Kernel_, Ite
typedef Vertex_handle Constructor_parameter; typedef Vertex_handle Constructor_parameter;
typedef Vertex_const_handle Constructor_const_parameter; typedef Vertex_const_handle Constructor_const_parameter;
using Base::init_range; // AF add CR
public: public:
SNC_sphere_map(bool construct=false) : Base(), destruct(construct) { SNC_sphere_map(bool construct=false) : Base(), destruct(construct) {
if(!construct) return; if(!construct) return;
@ -228,7 +228,7 @@ class SNC_sphere_map : public Items_::template Vertex<SNC_structure<Kernel_, Ite
operator Object_handle() const { return Ibase::operator*(); } operator Object_handle() const { return Ibase::operator*(); }
Object_handle& operator*() const { return Ibase::operator*(); } Object_handle& operator*() const { return Ibase::operator*(); }
Object_handle operator->() const Object_handle operator->() const
{ this->CGAL_nef_assertion_msg(0,"not impl."); return Object_handle(); } { CGAL_assertion_msg(0,"not impl."); return Object_handle(); }
}; };
class SFace_cycle_const_iterator : public Object_const_iterator class SFace_cycle_const_iterator : public Object_const_iterator
@ -259,7 +259,7 @@ class SNC_sphere_map : public Items_::template Vertex<SNC_structure<Kernel_, Ite
operator Object_handle() const { return Ibase::operator*(); } operator Object_handle() const { return Ibase::operator*(); }
const Object_handle& operator*() const { return Ibase::operator*(); } const Object_handle& operator*() const { return Ibase::operator*(); }
Object_handle operator->() const Object_handle operator->() const
{ this->CGAL_nef_assertion_msg(0,"not impl."); return Object_handle(); } { CGAL_assertion_msg(0,"not impl."); return Object_handle(); }
}; };
SFace_cycle_const_iterator sface_cycles_begin(SFace_const_handle f) const SFace_cycle_const_iterator sface_cycles_begin(SFace_const_handle f) const

3
Nef_3/include/CGAL/Nef_polyhedron_3.h
View File

@ -173,6 +173,9 @@ class Nef_polyhedron_3 : public CGAL::Handle_for< Nef_polyhedron_3_rep<Kernel_,
typedef typename Kernel::Segment_3 Segment_3; typedef typename Kernel::Segment_3 Segment_3;
typedef typename Kernel::Aff_transformation_3 Aff_transformation_3; typedef typename Kernel::Aff_transformation_3 Aff_transformation_3;
//typedef SNC_const_decorator<SNC_structure<Kernel_,Items_,Mark_> > Decorator;
//using Decorator::set_snc;
struct Polylines_tag {}; struct Polylines_tag {};
enum Boundary { EXCLUDED=0, INCLUDED=1 }; enum Boundary { EXCLUDED=0, INCLUDED=1 };