From 75d663d3054c41df0859c62035bde1e4ef9b3cb8 Mon Sep 17 00:00:00 2001 From: Daniel Russel Date: Sat, 7 Apr 2007 19:07:06 +0000 Subject: [PATCH] see if VC is happy now about not recognizing template argument --- .../CGAL/Kinetic/Delaunay_triangulation_3.h | 10 ++++---- .../CGAL/Kinetic/Regular_triangulation_3.h | 22 ++++++++--------- .../internal/Delaunay_triangulation_base_3.h | 24 +++++++++---------- .../Kinetic_data_structures/random_kds.cpp | 2 +- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_3.h b/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_3.h index 8bb210a6ca4..d5196b2d798 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_3.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_3.h @@ -87,8 +87,8 @@ typedef typename TraitsT::Simulator::Event_key Event_key; typedef TriangulationT Triangulation; 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 internal::Delaunay_3_edge_flip_event Edge_flip; - typedef typename internal::Delaunay_3_facet_flip_event Facet_flip; + typedef internal::Delaunay_3_edge_flip_event Edge_flip; + typedef typename internal::Delaunay_3_facet_flip_event Facet_flip; 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; + friend class internal::Delaunay_event_base_3; - friend class internal::Delaunay_3_edge_flip_event; + friend class internal::Delaunay_3_edge_flip_event; - friend class internal::Delaunay_3_facet_flip_event; + friend class internal::Delaunay_3_facet_flip_event; diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_3.h b/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_3.h index b1b3b88ac4b..e3b844c06a1 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_3.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_3.h @@ -43,9 +43,9 @@ CGAL_KINETIC_BEGIN_INTERNAL_NAMESPACE template -class Regular_3_pop_event: public Delaunay_event_base_3 +class Regular_3_pop_event: public Delaunay_event_base_3 { - typedef Delaunay_event_base_3 P; + typedef Delaunay_event_base_3 P; public: Regular_3_pop_event(const typename KD::Root_stack &s, const typename KD::Vertex_handle &vh, @@ -92,9 +92,9 @@ protected: template -class Regular_3_non_vertex_event: public Delaunay_event_base_3 +class Regular_3_non_vertex_event: public Delaunay_event_base_3 { - typedef Delaunay_event_base_3 P; + typedef Delaunay_event_base_3 P; public: Regular_3_non_vertex_event(const typename KD::Root_stack &s, @@ -271,14 +271,14 @@ public: typedef Regular_triangulation_3 This_RT3; typedef TraitsT Traits; typedef typename Traits::Active_points_3_table::Key Point_key; //here - + typedef typename Traits::Kinetic_kernel::Certificate Root_stack; protected: typedef typename Traits::Active_points_3_table MPT; // here typedef typename Traits::Simulator Simulator; typedef typename Traits::Simulator::Event_key Event_key; typedef typename Traits::Simulator::Time Time; - typedef typename Traits::Kinetic_kernel::Certificate Root_stack; + typedef TriangulationT Delaunay; typedef internal::Regular_triangulation_3_types Types; @@ -368,11 +368,11 @@ public: typedef VisitorT Visitor; - friend class internal::Delaunay_event_base_3; - typedef internal::Delaunay_3_edge_flip_event Edge_flip; - friend class internal::Delaunay_3_edge_flip_event; - typedef internal::Delaunay_3_facet_flip_event Facet_flip; - friend class internal::Delaunay_3_facet_flip_event; + friend class internal::Delaunay_event_base_3; + typedef internal::Delaunay_3_edge_flip_event Edge_flip; + friend class internal::Delaunay_3_edge_flip_event; + typedef internal::Delaunay_3_facet_flip_event Facet_flip; + friend class internal::Delaunay_3_facet_flip_event; typedef internal::Regular_3_pop_event Pop_event; friend class internal::Regular_3_pop_event; diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Delaunay_triangulation_base_3.h b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Delaunay_triangulation_base_3.h index 2d74f1ade38..48917fddd18 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Delaunay_triangulation_base_3.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Delaunay_triangulation_base_3.h @@ -40,12 +40,12 @@ CGAL_KINETIC_BEGIN_INTERNAL_NAMESPACE -template +template class Delaunay_event_base_3: public Event_base { typedef Event_base P; public: - Delaunay_event_base_3(const typename KD::Root_stack &s, + Delaunay_event_base_3(const RS &s, KD *kdel):P(kdel), s_(s){ } //! Default constructor @@ -59,7 +59,7 @@ public: // for some reason VC insists that this be there 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_; } @@ -72,7 +72,7 @@ public: return P::kds(); } protected: - const typename KD::Root_stack s_; + const RS s_; }; /*template @@ -83,12 +83,12 @@ std::ostream& operator<<(std::ostream &out, const Delaunay_event_base_3 &e }*/ -template -class Delaunay_3_edge_flip_event: public Delaunay_event_base_3 +template +class Delaunay_3_edge_flip_event: public Delaunay_event_base_3 { public: - typedef Delaunay_event_base_3 P; - Delaunay_3_edge_flip_event(const typename KD::Root_stack &s, + typedef Delaunay_event_base_3 P; + Delaunay_3_edge_flip_event(const RS &s, const typename KD::Edge &e, KD *kdel):P(s, kdel), e_(e) { #ifndef NDEBUG @@ -138,12 +138,12 @@ std::ostream& operator<<(std::ostream &out, const Delaunay_3_edge_flip_event -class Delaunay_3_facet_flip_event: public Delaunay_event_base_3 +template +class Delaunay_3_facet_flip_event: public Delaunay_event_base_3 { public: - typedef Delaunay_event_base_3 P; - Delaunay_3_facet_flip_event(const typename KD::Root_stack &s, + typedef Delaunay_event_base_3 P; + Delaunay_3_facet_flip_event(const RS &s, const typename KD::Facet &e, KD *kdel): P(s, kdel),e_(e) { #ifndef NDEBUG diff --git a/Kinetic_data_structures/test/Kinetic_data_structures/random_kds.cpp b/Kinetic_data_structures/test/Kinetic_data_structures/random_kds.cpp index f7505bc25d3..5a76f1bc24a 100644 --- a/Kinetic_data_structures/test/Kinetic_data_structures/random_kds.cpp +++ b/Kinetic_data_structures/test/Kinetic_data_structures/random_kds.cpp @@ -122,7 +122,7 @@ int main(int, char *[]) { DS ds(tr); 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(r, r.get_int(0,5)), rp(r, r.get_int(0,5)), rp(r, r.get_int(0,5))),