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

see if VC is happy now about not recognizing template argument

This commit is contained in:
Daniel Russel 2007-04-07 19:07:06 +00:00
parent 8c80580bee
commit 75d663d305
4 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_3.h
View File

@ -87,8 +87,8 @@ typedef typename TraitsT::Simulator::Event_key Event_key;
typedef TriangulationT Triangulation; typedef TriangulationT Triangulation;
typedef typename TraitsT::Kinetic_kernel::Side_of_oriented_sphere_3 Side_of_oriented_sphere_3; typedef typename TraitsT::Kinetic_kernel::Side_of_oriented_sphere_3 Side_of_oriented_sphere_3;
typedef typename TraitsT::Kinetic_kernel::Orientation_3 Orientation_3; typedef typename TraitsT::Kinetic_kernel::Orientation_3 Orientation_3;
typedef internal::Delaunay_3_edge_flip_event<This_DT3> Edge_flip; typedef internal::Delaunay_3_edge_flip_event<This_DT3, Root_stack> Edge_flip;
typedef typename internal::Delaunay_3_facet_flip_event<This_DT3> Facet_flip; typedef typename internal::Delaunay_3_facet_flip_event<This_DT3, Root_stack> Facet_flip;
Side_of_oriented_sphere_3 side_of_oriented_sphere_3_object() const Side_of_oriented_sphere_3 side_of_oriented_sphere_3_object() const
{ {
@ -114,11 +114,11 @@ typedef typename TraitsT::Simulator::Event_key Event_key;
}; };
friend class internal::Delaunay_event_base_3<This>; friend class internal::Delaunay_event_base_3<This, Root_stack>;
friend class internal::Delaunay_3_edge_flip_event<This>; friend class internal::Delaunay_3_edge_flip_event<This, Root_stack>;
friend class internal::Delaunay_3_facet_flip_event<This>; friend class internal::Delaunay_3_facet_flip_event<This, Root_stack>;

22
Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_3.h
View File

@ -43,9 +43,9 @@
CGAL_KINETIC_BEGIN_INTERNAL_NAMESPACE CGAL_KINETIC_BEGIN_INTERNAL_NAMESPACE
template <class KD> template <class KD>
class Regular_3_pop_event: public Delaunay_event_base_3<KD> class Regular_3_pop_event: public Delaunay_event_base_3<KD, typename KD::Root_stack>
{ {
typedef Delaunay_event_base_3<KD> P; typedef Delaunay_event_base_3<KD, typename KD::Root_stack> P;
public: public:
Regular_3_pop_event(const typename KD::Root_stack &s, Regular_3_pop_event(const typename KD::Root_stack &s,
const typename KD::Vertex_handle &vh, const typename KD::Vertex_handle &vh,
@ -92,9 +92,9 @@ protected:
template <class KD> template <class KD>
class Regular_3_non_vertex_event: public Delaunay_event_base_3<KD> class Regular_3_non_vertex_event: public Delaunay_event_base_3<KD, typename KD::Root_stack>
{ {
typedef Delaunay_event_base_3<KD> P; typedef Delaunay_event_base_3<KD, typename KD::Root_stack> P;
public: public:
Regular_3_non_vertex_event(const typename KD::Root_stack &s, Regular_3_non_vertex_event(const typename KD::Root_stack &s,
@ -271,14 +271,14 @@ public:
typedef Regular_triangulation_3<TraitsT, VisitorT, TriangulationT> This_RT3; typedef Regular_triangulation_3<TraitsT, VisitorT, TriangulationT> This_RT3;
typedef TraitsT Traits; typedef TraitsT Traits;
typedef typename Traits::Active_points_3_table::Key Point_key; //here typedef typename Traits::Active_points_3_table::Key Point_key; //here
typedef typename Traits::Kinetic_kernel::Certificate Root_stack;
protected: protected:
typedef typename Traits::Active_points_3_table MPT; // here typedef typename Traits::Active_points_3_table MPT; // here
typedef typename Traits::Simulator Simulator; typedef typename Traits::Simulator Simulator;
typedef typename Traits::Simulator::Event_key Event_key; typedef typename Traits::Simulator::Event_key Event_key;
typedef typename Traits::Simulator::Time Time; typedef typename Traits::Simulator::Time Time;
typedef typename Traits::Kinetic_kernel::Certificate Root_stack;
typedef TriangulationT Delaunay; typedef TriangulationT Delaunay;
typedef internal::Regular_triangulation_3_types<TraitsT> Types; typedef internal::Regular_triangulation_3_types<TraitsT> Types;
@ -368,11 +368,11 @@ public:
typedef VisitorT Visitor; typedef VisitorT Visitor;
friend class internal::Delaunay_event_base_3<This>; friend class internal::Delaunay_event_base_3<This, Root_stack>;
typedef internal::Delaunay_3_edge_flip_event<This> Edge_flip; typedef internal::Delaunay_3_edge_flip_event<This, Root_stack> Edge_flip;
friend class internal::Delaunay_3_edge_flip_event<This>; friend class internal::Delaunay_3_edge_flip_event<This, Root_stack>;
typedef internal::Delaunay_3_facet_flip_event<This> Facet_flip; typedef internal::Delaunay_3_facet_flip_event<This, Root_stack> Facet_flip;
friend class internal::Delaunay_3_facet_flip_event<This>; friend class internal::Delaunay_3_facet_flip_event<This, Root_stack>;
typedef internal::Regular_3_pop_event<This> Pop_event; typedef internal::Regular_3_pop_event<This> Pop_event;
friend class internal::Regular_3_pop_event<This>; friend class internal::Regular_3_pop_event<This>;

24
Kinetic_data_structures/include/CGAL/Kinetic/internal/Delaunay_triangulation_base_3.h
View File

@ -40,12 +40,12 @@
CGAL_KINETIC_BEGIN_INTERNAL_NAMESPACE CGAL_KINETIC_BEGIN_INTERNAL_NAMESPACE
template <class KD> template <class KD, class RS>
class Delaunay_event_base_3: public Event_base<KD*> class Delaunay_event_base_3: public Event_base<KD*>
{ {
typedef Event_base<KD*> P; typedef Event_base<KD*> P;
public: public:
Delaunay_event_base_3(const typename KD::Root_stack &s, Delaunay_event_base_3(const RS &s,
KD *kdel):P(kdel), s_(s){ KD *kdel):P(kdel), s_(s){
} }
//! Default constructor //! Default constructor
@ -59,7 +59,7 @@ public:
// for some reason VC insists that this be there // for some reason VC insists that this be there
CGAL_assertion(0 && "Process called in Delaunay_event_base_3"); CGAL_assertion(0 && "Process called in Delaunay_event_base_3");
} }
const typename KD::Root_stack& root_stack() const const RS& root_stack() const
{ {
return s_; return s_;
} }
@ -72,7 +72,7 @@ public:
return P::kds(); return P::kds();
} }
protected: protected:
const typename KD::Root_stack s_; const RS s_;
}; };
/*template <class K, class R> /*template <class K, class R>
@ -83,12 +83,12 @@ std::ostream& operator<<(std::ostream &out, const Delaunay_event_base_3<K, R> &e
}*/ }*/
template <class KD> template <class KD, class RS>
class Delaunay_3_edge_flip_event: public Delaunay_event_base_3<KD> class Delaunay_3_edge_flip_event: public Delaunay_event_base_3<KD, RS>
{ {
public: public:
typedef Delaunay_event_base_3<KD> P; typedef Delaunay_event_base_3<KD, RS> P;
Delaunay_3_edge_flip_event(const typename KD::Root_stack &s, Delaunay_3_edge_flip_event(const RS &s,
const typename KD::Edge &e, const typename KD::Edge &e,
KD *kdel):P(s, kdel), e_(e) { KD *kdel):P(s, kdel), e_(e) {
#ifndef NDEBUG #ifndef NDEBUG
@ -138,12 +138,12 @@ std::ostream& operator<<(std::ostream &out, const Delaunay_3_edge_flip_event<B,
}*/ }*/
template <class KD> template <class KD, class RS>
class Delaunay_3_facet_flip_event: public Delaunay_event_base_3<KD> class Delaunay_3_facet_flip_event: public Delaunay_event_base_3<KD, RS>
{ {
public: public:
typedef Delaunay_event_base_3<KD> P; typedef Delaunay_event_base_3<KD, RS> P;
Delaunay_3_facet_flip_event(const typename KD::Root_stack &s, Delaunay_3_facet_flip_event(const RS &s,
const typename KD::Facet &e, const typename KD::Facet &e,
KD *kdel): P(s, kdel),e_(e) { KD *kdel): P(s, kdel),e_(e) {
#ifndef NDEBUG #ifndef NDEBUG

2
Kinetic_data_structures/test/Kinetic_data_structures/random_kds.cpp
View File

@ -122,7 +122,7 @@ int main(int, char *[]) {
DS ds(tr); DS ds(tr);
std::cout << "Points are:\n"; std::cout << "Points are:\n";
for (int i=0; i< nump/2.5; ++i){ for (int i=0; i< nump/2; ++i){
Point pt = Point(Bare_point(rp<F>(r, r.get_int(0,5)), Point pt = Point(Bare_point(rp<F>(r, r.get_int(0,5)),
rp<F>(r, r.get_int(0,5)), rp<F>(r, r.get_int(0,5)),
rp<F>(r, r.get_int(0,5))), rp<F>(r, r.get_int(0,5))),