From 7dfd4237cc774f74d2e285f552dec45be6584fa1 Mon Sep 17 00:00:00 2001 From: Sylvain Pion Date: Sun, 15 Jun 2008 16:21:29 +0000 Subject: [PATCH] Rename SS and CS to avoid name clashes with macros on x86/solaris (/usr/include/sys/regset.h). --- .../CGAL/Safe_circulator_from_iterator.h | 8 +- Circulator/include/CGAL/circulator.h | 6 +- Core/include/CGAL/CORE/poly/Curves.tcc | 16 +- Core/include/CGAL/CORE/poly/Sturm.h | 8 +- ...Updatable_Delaunay_triangulation_table_2.h | 16 +- .../Straight_skeleton_builder_2_impl.h | 192 +++++++++--------- 6 files changed, 123 insertions(+), 123 deletions(-) diff --git a/Circulator/include/CGAL/Safe_circulator_from_iterator.h b/Circulator/include/CGAL/Safe_circulator_from_iterator.h index 87b796e7ff4..3a88df7b955 100644 --- a/Circulator/include/CGAL/Safe_circulator_from_iterator.h +++ b/Circulator/include/CGAL/Safe_circulator_from_iterator.h @@ -34,15 +34,15 @@ CGAL_BEGIN_NAMESPACE -// Note: TT, SS, and DD are here for backwards compatibility, they are +// Note: Tt, Ss, and Dd are here for backwards compatibility, they are // not used. -template < class I, class TT = int, class SS = int, class DD = int> +template < class I, class Tt = int, class Ss = int, class Dd = int> class Safe_circulator_from_iterator { public: // TYPES - typedef Safe_circulator_from_iterator Self; - typedef Circulator_from_iterator Unsafe; + typedef Safe_circulator_from_iterator Self; + typedef Circulator_from_iterator Unsafe; typedef I iterator; typedef std::iterator_traits Traits; diff --git a/Circulator/include/CGAL/circulator.h b/Circulator/include/CGAL/circulator.h index 99c571cdd80..02f568be948 100644 --- a/Circulator/include/CGAL/circulator.h +++ b/Circulator/include/CGAL/circulator.h @@ -964,14 +964,14 @@ operator+( typename Const_circulator_from_container::difference_type n, } -// Note: TT, SS, and DD are here for backwards compatibility, they are +// Note: Tt, Ss, and Dd are here for backwards compatibility, they are // not used. -template < class I, class TT = int, class SS = int, class DD = int> +template < class I, class Tt = int, class Ss = int, class Dd = int> class Circulator_from_iterator { public: // TYPES - typedef Circulator_from_iterator Self; + typedef Circulator_from_iterator Self; typedef I iterator; typedef std::iterator_traits Traits; diff --git a/Core/include/CGAL/CORE/poly/Curves.tcc b/Core/include/CGAL/CORE/poly/Curves.tcc index 6ba67304e4d..ab36dd4c593 100644 --- a/Core/include/CGAL/CORE/poly/Curves.tcc +++ b/Core/include/CGAL/CORE/poly/Curves.tcc @@ -1163,13 +1163,13 @@ int Curve::verticalIntersections(const BigFloat & x, BFVecInterval & vI, d = PY.getTrueDegree(); if(d <= 0) return(d); - Sturm SS(PY); // should be replaced by BigFloat version - // Sturm SS(PY); // unstable still - SS.isolateRoots(vI); + Sturm Ss(PY); // should be replaced by BigFloat version + // Sturm Ss(PY); // unstable still + Ss.isolateRoots(vI); int s = vI.size(); if ((aprec != 0) && (s>0)) - SS.newtonRefineAllRoots(vI, aprec); + Ss.newtonRefineAllRoots(vI, aprec); return s; } @@ -1397,16 +1397,16 @@ if (!xCurr.isExact()) std::cout<<"xCurr has error! xCurr=" << xCurr << std::endl // Assumes that C & D are quasi-monic.(or generally aligned) template void Xintersections( Curve& P ,Curve& Q, BFVecInterval &vI){ - Sturm SS(resY(P, Q)); - SS.isolateRoots(vI); + Sturm Ss(resY(P, Q)); + Ss.isolateRoots(vI); } //Yintersections(C, D, vI): // similar to Xintersections template void Yintersections( Curve& P ,Curve& Q, BFVecInterval &vI){ - Sturm SS(resX(P, Q)); - SS.isolateRoots(vI); + Sturm Ss(resX(P, Q)); + Ss.isolateRoots(vI); } // Display Intervals diff --git a/Core/include/CGAL/CORE/poly/Sturm.h b/Core/include/CGAL/CORE/poly/Sturm.h index 8b345e66204..023909bca1c 100644 --- a/Core/include/CGAL/CORE/poly/Sturm.h +++ b/Core/include/CGAL/CORE/poly/Sturm.h @@ -1099,9 +1099,9 @@ CORE_INLINE bool isZeroIn(BFInterval I) { template CORE_INLINE void testSturm(const Polynomial&P, int prec, int n = -1) { - Sturm SS (P); + Sturm Ss (P); BFVecInterval v; - SS.refineAllRoots(v, prec); + Ss.refineAllRoots(v, prec); std::cout << " Number of roots is " << v.size() <= 0) & (v.size() == (unsigned)n)) std::cout << " (CORRECT!)" << std::endl; @@ -1122,9 +1122,9 @@ CORE_INLINE void testSturm(const Polynomial&P, int prec, int n = -1) { // (will print an error message if n is wrong) template CORE_INLINE void testNewtonSturm(const Polynomial&P, int prec, int n = -1) { - Sturm SS (P); + Sturm Ss (P); BFVecInterval v; - SS.newtonRefineAllRoots(v, prec); + Ss.newtonRefineAllRoots(v, prec); std::cout << " Number of roots is " << v.size(); if ((n >= 0) & (v.size() == (unsigned)n)) std::cout << " (CORRECT!)" << std::endl; diff --git a/Kinetic_data_structures/hidden/include/CGAL/Updatable_Delaunay_triangulation_table_2.h b/Kinetic_data_structures/hidden/include/CGAL/Updatable_Delaunay_triangulation_table_2.h index 1924cefe17c..054f0b81295 100644 --- a/Kinetic_data_structures/hidden/include/CGAL/Updatable_Delaunay_triangulation_table_2.h +++ b/Kinetic_data_structures/hidden/include/CGAL/Updatable_Delaunay_triangulation_table_2.h @@ -76,8 +76,8 @@ struct URefiner { typedef typename UI::Exact_certificate Exact_certificate; typedef typename UI::Exact_time Exact_root; typedef CGAL::Interval_nt_advanced INT; - struct CS: public CGAL::Kinetic::Ref_counted { - CS(const Exact_certificate &c): cert_(c){} + struct Cs: public CGAL::Kinetic::Ref_counted { + Cs(const Exact_certificate &c): cert_(c){} Exact_certificate cert_; }; @@ -108,7 +108,7 @@ struct URefiner { if (has_exact_root()) return false; double dd= iv.second-iv.first; - if (cert_ == typename CS::Handle()) { + if (cert_ == typename Cs::Handle()) { CGAL::Protect_FPU_rounding prot; INT niv=ui_->Newton_refine(certf_, certpf_, INT(iv)); @@ -160,7 +160,7 @@ struct URefiner { } bool has_exact_root() const { - return cert_!= typename CS::Handle() ; + return cert_!= typename Cs::Handle() ; } CGAL::Sign sign_at(INT t) const { @@ -180,7 +180,7 @@ struct URefiner { ++stat_exact_certificate_functions_; ++stat_exact_certificate_functions_from_compare_; CGAL_UD_DEBUG("Generating exact with interval " << iv.first << " " << iv.second << std::endl); - cert_= new CS(ui_->compute_exact_failure_time(tuple_, iv.first)); + cert_= new Cs(ui_->compute_exact_failure_time(tuple_, iv.first)); CGAL_UD_DEBUG("Got " << cert_->cert_.failure_time() << std::endl); CGAL_assertion(check_.failure_time() == cert_->cert_.failure_time()); //iv= CGAL::to_interval(exact_root()); @@ -191,7 +191,7 @@ struct URefiner { cs[1]=-1.0; typename Exact_certificate::Function f(cs, cs+2); // hack - cert_= new CS(Exact_certificate(f, typename UI::Kinetic_kernel::Function_kernel(), -1, 2)); + cert_= new Cs(Exact_certificate(f, typename UI::Kinetic_kernel::Function_kernel(), -1, 2)); CGAL_UD_DEBUG(f << ": " << exact_root() << std::endl); CGAL_assertion(exact_root() == Exact_root(iv.first)); #ifndef NDEBUG @@ -225,7 +225,7 @@ struct URefiner { void set_exact_certificate(const Exact_certificate& ec) { CGAL_precondition(!has_exact_root()); - cert_= new CS(ec); + cert_= new Cs(ec); CGAL_postcondition(exact_root() == check_.failure_time()); } @@ -239,7 +239,7 @@ struct URefiner { Cert_tuple tuple_; typename UI::Handle ui_; - mutable typename CS::Handle cert_; + mutable typename Cs::Handle cert_; typename UI::Certificate_function certf_; typename UI::Certificate_derivitive certpf_; #ifndef NDEBUG diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_2_impl.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_2_impl.h index 7ef1c2a0cdd..dbdb321f4da 100644 --- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_2_impl.h +++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_2_impl.h @@ -33,8 +33,8 @@ CGAL_BEGIN_NAMESPACE -template -Straight_skeleton_builder_2::Straight_skeleton_builder_2 ( boost::optional aMaxTime, Traits const& aTraits, Visitor const& aVisitor ) +template +Straight_skeleton_builder_2::Straight_skeleton_builder_2 ( boost::optional aMaxTime, Traits const& aTraits, Visitor const& aVisitor ) : mTraits(aTraits) ,mVisitor(aVisitor) @@ -50,34 +50,34 @@ Straight_skeleton_builder_2::Straight_skeleton_builder_2 ( boost::optio { } -template -typename Straight_skeleton_builder_2::Halfedge_handle -Straight_skeleton_builder_2::validate( Halfedge_handle aH ) const +template +typename Straight_skeleton_builder_2::Halfedge_handle +Straight_skeleton_builder_2::validate( Halfedge_handle aH ) const { if ( !handle_assigned(aH) ) throw std::runtime_error("Incomplete straight skeleton"); return aH ; } -template -typename Straight_skeleton_builder_2::Vertex_handle -Straight_skeleton_builder_2::validate( Vertex_handle aH ) const +template +typename Straight_skeleton_builder_2::Vertex_handle +Straight_skeleton_builder_2::validate( Vertex_handle aH ) const { if ( !handle_assigned(aH) ) throw std::runtime_error("Incomplete straight skeleton"); return aH ; } -template -void Straight_skeleton_builder_2::InsertEventInPQ( EventPtr aEvent ) +template +void Straight_skeleton_builder_2::InsertEventInPQ( EventPtr aEvent ) { mPQ.push(aEvent); CGAL_STSKEL_BUILDER_TRACE(4, "Enque: " << *aEvent); } -template -typename Straight_skeleton_builder_2::EventPtr -Straight_skeleton_builder_2::PopEventFromPQ() +template +typename Straight_skeleton_builder_2::EventPtr +Straight_skeleton_builder_2::PopEventFromPQ() { EventPtr rR = mPQ.top(); mPQ.pop(); return rR ; @@ -86,9 +86,9 @@ Straight_skeleton_builder_2::PopEventFromPQ() // Tests whether there is an edge event between the 3 contour edges defining nodes 'aLnode' and 'aRNode'. // If such event exits and is not in the past, it's returned. Otherwise the result is null // -template -typename Straight_skeleton_builder_2::EventPtr -Straight_skeleton_builder_2::FindEdgeEvent( Vertex_handle aLNode, Vertex_handle aRNode ) +template +typename Straight_skeleton_builder_2::EventPtr +Straight_skeleton_builder_2::FindEdgeEvent( Vertex_handle aLNode, Vertex_handle aRNode ) { EventPtr rResult ; @@ -121,9 +121,9 @@ Straight_skeleton_builder_2::FindEdgeEvent( Vertex_handle aLNode, Verte } -template -typename Straight_skeleton_builder_2::EventPtr -Straight_skeleton_builder_2::IsPseudoSplitEvent( EventPtr const& aEvent, Vertex_handle_pair aOpp, Site const& aSite ) +template +typename Straight_skeleton_builder_2::EventPtr +Straight_skeleton_builder_2::IsPseudoSplitEvent( EventPtr const& aEvent, Vertex_handle_pair aOpp, Site const& aSite ) { EventPtr rPseudoSplitEvent ; @@ -183,8 +183,8 @@ Straight_skeleton_builder_2::IsPseudoSplitEvent( EventPtr const& aEvent // the 'reflex borders' are not consecutive in the input polygon but they are in the corresponding offset polygon that // contains aNode as a vertex. // -template -void Straight_skeleton_builder_2::CollectSplitEvent( Vertex_handle aNode, Triedge const& aTriedge ) +template +void Straight_skeleton_builder_2::CollectSplitEvent( Vertex_handle aNode, Triedge const& aTriedge ) { if ( IsOppositeEdgeFacingTheSplitSeed(aNode,aTriedge.e2()) ) { @@ -207,8 +207,8 @@ void Straight_skeleton_builder_2::CollectSplitEvent( Vertex_handle aNod } // Tests the reflex wavefront emerging from 'aNode' against the other contour edges in search for split events. -template -void Straight_skeleton_builder_2::CollectSplitEvents( Vertex_handle aNode ) +template +void Straight_skeleton_builder_2::CollectSplitEvents( Vertex_handle aNode ) { // lLBorder and lRBorder are the consecutive contour edges forming the reflex wavefront. Triedge const& lTriedge = GetVertexTriedge(aNode); @@ -233,8 +233,8 @@ void Straight_skeleton_builder_2::CollectSplitEvents( Vertex_handle aNo // Finds and enques all the new potential events produced by the vertex wavefront emerging from 'aNode' (which can be a reflex wavefront). // This new events are simply stored in the priority queue, not processed. -template -void Straight_skeleton_builder_2::CollectNewEvents( Vertex_handle aNode ) +template +void Straight_skeleton_builder_2::CollectNewEvents( Vertex_handle aNode ) { // A Straight Skeleton is the trace of the 'grassfire propagation' that corresponds to the inward move of all the vertices // of a polygon along their angular bisectors. @@ -300,8 +300,8 @@ void Straight_skeleton_builder_2::CollectNewEvents( Vertex_handle aNode // This ocurrs when the bisector emerging from vertex 'aA' is defined by the same pair of // contour edges as the bisector emerging from vertex 'aB' (but in opposite order). // -template -void Straight_skeleton_builder_2::HandleSimultaneousEdgeEvent( Vertex_handle aA, Vertex_handle aB ) +template +void Straight_skeleton_builder_2::HandleSimultaneousEdgeEvent( Vertex_handle aA, Vertex_handle aB ) { CGAL_STSKEL_BUILDER_TRACE ( 2, "Handling simultaneous EdgeEvent between N" << aA ->id() << " and N" << aB ->id() ) ; @@ -400,8 +400,8 @@ void Straight_skeleton_builder_2::HandleSimultaneousEdgeEvent( Vertex_h // Returns true if the skeleton edges 'aA' and 'aB' are defined by the same pair of contour edges (but possibly in reverse order) // -template -bool Straight_skeleton_builder_2::AreBisectorsCoincident ( Halfedge_const_handle aA, Halfedge_const_handle aB ) const +template +bool Straight_skeleton_builder_2::AreBisectorsCoincident ( Halfedge_const_handle aA, Halfedge_const_handle aB ) const { CGAL_STSKEL_BUILDER_TRACE ( 3, "Testing for simultaneous EdgeEvents between B" << aA->id() << " and B" << aB->id() ) ; @@ -414,8 +414,8 @@ bool Straight_skeleton_builder_2::AreBisectorsCoincident ( Halfedge_con || ( lA_LBorder == lB_RBorder && lA_RBorder == lB_LBorder ) ; } -template -void Straight_skeleton_builder_2::UpdatePQ( Vertex_handle aNode ) +template +void Straight_skeleton_builder_2::UpdatePQ( Vertex_handle aNode ) { Vertex_handle lPrev = GetPrevInLAV(aNode) ; Vertex_handle lNext = GetNextInLAV(aNode) ; @@ -434,8 +434,8 @@ void Straight_skeleton_builder_2::UpdatePQ( Vertex_handle aNode ) else CollectNewEvents(aNode); } -template -void Straight_skeleton_builder_2::CreateInitialEvents() +template +void Straight_skeleton_builder_2::CreateInitialEvents() { CGAL_STSKEL_BUILDER_TRACE(0, "Creating initial events..."); for ( Vertex_iterator v = mSSkel->vertices_begin(); v != mSSkel->vertices_end(); ++ v ) @@ -449,8 +449,8 @@ void Straight_skeleton_builder_2::CreateInitialEvents() } -template -void Straight_skeleton_builder_2::CreateContourBisectors() +template +void Straight_skeleton_builder_2::CreateContourBisectors() { CGAL_STSKEL_BUILDER_TRACE(0, "Creating contour bisectors..."); for ( Vertex_iterator v = mSSkel->vertices_begin(); v != mSSkel->vertices_end(); ++ v ) @@ -520,8 +520,8 @@ void Straight_skeleton_builder_2::CreateContourBisectors() } } -template -void Straight_skeleton_builder_2::InitPhase() +template +void Straight_skeleton_builder_2::InitPhase() { mVisitor.on_initialization_started(mSSkel->size_of_vertices()); CreateContourBisectors(); @@ -529,9 +529,9 @@ void Straight_skeleton_builder_2::InitPhase() mVisitor.on_initialization_finished(); } -template -typename Straight_skeleton_builder_2::Vertex_handle -Straight_skeleton_builder_2::ConstructEdgeEventNode( EdgeEvent& aEvent ) +template +typename Straight_skeleton_builder_2::Vertex_handle +Straight_skeleton_builder_2::ConstructEdgeEventNode( EdgeEvent& aEvent ) { CGAL_STSKEL_BUILDER_TRACE ( 2, "Creating EdgeEvent Node" ) ; @@ -574,9 +574,9 @@ Straight_skeleton_builder_2::ConstructEdgeEventNode( EdgeEvent& aEvent } -template -typename Straight_skeleton_builder_2::Vertex_handle_pair -Straight_skeleton_builder_2::LookupOnSLAV ( Halfedge_handle aBorder, EventPtr const& aEvent, Site& rSite ) +template +typename Straight_skeleton_builder_2::Vertex_handle_pair +Straight_skeleton_builder_2::LookupOnSLAV ( Halfedge_handle aBorder, EventPtr const& aEvent, Site& rSite ) { Vertex_handle_pair rResult ; @@ -651,9 +651,9 @@ Straight_skeleton_builder_2::LookupOnSLAV ( Halfedge_handle aBorder, Ev -template -typename Straight_skeleton_builder_2::Vertex_handle_pair -Straight_skeleton_builder_2::ConstructSplitEventNodes( SplitEvent& aEvent, Vertex_handle aOppR ) +template +typename Straight_skeleton_builder_2::Vertex_handle_pair +Straight_skeleton_builder_2::ConstructSplitEventNodes( SplitEvent& aEvent, Vertex_handle aOppR ) { Vertex_handle_pair rResult; @@ -705,9 +705,9 @@ Straight_skeleton_builder_2::ConstructSplitEventNodes( SplitEvent& aEve return rResult ; } -template -typename Straight_skeleton_builder_2::Vertex_handle_pair -Straight_skeleton_builder_2::ConstructPseudoSplitEventNodes( PseudoSplitEvent& aEvent ) +template +typename Straight_skeleton_builder_2::Vertex_handle_pair +Straight_skeleton_builder_2::ConstructPseudoSplitEventNodes( PseudoSplitEvent& aEvent ) { Vertex_handle_pair rResult; @@ -771,14 +771,14 @@ Straight_skeleton_builder_2::ConstructPseudoSplitEventNodes( PseudoSpli return rResult ; } -template -bool Straight_skeleton_builder_2::IsProcessed( EventPtr aEvent ) +template +bool Straight_skeleton_builder_2::IsProcessed( EventPtr aEvent ) { return IsProcessed(aEvent->seed0()) || IsProcessed(aEvent->seed1()) ; } -template -bool Straight_skeleton_builder_2::IsValidEdgeEvent( EdgeEvent const& aEvent ) +template +bool Straight_skeleton_builder_2::IsValidEdgeEvent( EdgeEvent const& aEvent ) { bool rResult = false ; @@ -826,8 +826,8 @@ bool Straight_skeleton_builder_2::IsValidEdgeEvent( EdgeEvent const& aE return rResult ; } -template -void Straight_skeleton_builder_2::HandleEdgeEvent( EventPtr aEvent ) +template +void Straight_skeleton_builder_2::HandleEdgeEvent( EventPtr aEvent ) { EdgeEvent& lEvent = dynamic_cast(*aEvent) ; @@ -917,14 +917,14 @@ void Straight_skeleton_builder_2::HandleEdgeEvent( EventPtr aEvent ) } } -template -bool Straight_skeleton_builder_2::IsValidSplitEvent( SplitEvent const& aEvent ) +template +bool Straight_skeleton_builder_2::IsValidSplitEvent( SplitEvent const& aEvent ) { return true ; } -template -void Straight_skeleton_builder_2::HandleSplitEvent( EventPtr aEvent, Vertex_handle_pair aOpp ) +template +void Straight_skeleton_builder_2::HandleSplitEvent( EventPtr aEvent, Vertex_handle_pair aOpp ) { SplitEvent& lEvent = dynamic_cast(*aEvent) ; @@ -1057,8 +1057,8 @@ void Straight_skeleton_builder_2::HandleSplitEvent( EventPtr aEvent, Ve } -template -void Straight_skeleton_builder_2::SetupNewNode( Vertex_handle aNode ) +template +void Straight_skeleton_builder_2::SetupNewNode( Vertex_handle aNode ) { // In an edge-edge anihiliation the current polygon becomes a two-node degenerate chain collapsed into a single point if ( GetPrevInLAV(aNode) != GetNextInLAV(aNode) ) @@ -1092,8 +1092,8 @@ bool counterclockwise_at_or_in_between_2( Direction const& p, Direction const& q return p == q || p == r || K().counterclockwise_in_between_2_object()(p,q,r) ; } -template -bool Straight_skeleton_builder_2::IsValidPseudoSplitEvent( PseudoSplitEvent const& aEvent ) +template +bool Straight_skeleton_builder_2::IsValidPseudoSplitEvent( PseudoSplitEvent const& aEvent ) { Vertex_handle lSeed0 = aEvent.seed0(); Vertex_handle lSeed1 = aEvent.seed1(); @@ -1146,8 +1146,8 @@ bool Straight_skeleton_builder_2::IsValidPseudoSplitEvent( PseudoSplitE return !lTangled ; } -template -void Straight_skeleton_builder_2::HandlePseudoSplitEvent( EventPtr aEvent ) +template +void Straight_skeleton_builder_2::HandlePseudoSplitEvent( EventPtr aEvent ) { PseudoSplitEvent& lEvent = dynamic_cast(*aEvent) ; @@ -1255,8 +1255,8 @@ void Straight_skeleton_builder_2::HandlePseudoSplitEvent( EventPtr aEve } } -template -void Straight_skeleton_builder_2::HandleSplitOrPseudoSplitEvent( EventPtr aEvent ) +template +void Straight_skeleton_builder_2::HandleSplitOrPseudoSplitEvent( EventPtr aEvent ) { Halfedge_handle lOppEdge = aEvent->triedge().e2() ; @@ -1273,24 +1273,24 @@ void Straight_skeleton_builder_2::HandleSplitOrPseudoSplitEvent( EventP } } -template -void Straight_skeleton_builder_2::InsertNextSplitEventInPQ( Vertex_handle v ) +template +void Straight_skeleton_builder_2::InsertNextSplitEventInPQ( Vertex_handle v ) { EventPtr lSplitEvent = PopNextSplitEvent(v); if ( !!lSplitEvent ) InsertEventInPQ(lSplitEvent); } -template -void Straight_skeleton_builder_2::InsertNextSplitEventsInPQ() +template +void Straight_skeleton_builder_2::InsertNextSplitEventsInPQ() { for ( typename Vertex_handle_vector::iterator v = mReflexVertices.begin(), ev = mReflexVertices.end(); v != ev ; ++ v ) if ( !IsProcessed(*v) ) InsertNextSplitEventInPQ(*v); } -template -void Straight_skeleton_builder_2::Propagate() +template +void Straight_skeleton_builder_2::Propagate() { CGAL_STSKEL_BUILDER_TRACE(0,"Propagating events..."); mVisitor.on_propagation_started(); @@ -1328,8 +1328,8 @@ void Straight_skeleton_builder_2::Propagate() mVisitor.on_propagation_finished(); } -template -void Straight_skeleton_builder_2::MergeSplitNodes ( Vertex_handle_pair aSplitNodes ) +template +void Straight_skeleton_builder_2::MergeSplitNodes ( Vertex_handle_pair aSplitNodes ) { Vertex_handle lLNode, lRNode ; boost::tie(lLNode,lRNode)=aSplitNodes; @@ -1373,8 +1373,8 @@ void Straight_skeleton_builder_2::MergeSplitNodes ( Vertex_handle_pair } -template -void Straight_skeleton_builder_2::EraseNode ( Vertex_handle aNode ) +template +void Straight_skeleton_builder_2::EraseNode ( Vertex_handle aNode ) { aNode->VBase::reset_id__internal__(-aNode->id()); mSSkel->SSkel::Base::vertices_erase(aNode); @@ -1452,8 +1452,8 @@ bool ValidateFinalBisectorsAfterMerge( Vertex_handle /* v */, Halfedge_around_ve } -template -void Straight_skeleton_builder_2::RelinkBisectorsAroundMultinode( Vertex_handle const& v0, Halfedge_handle_vector& aLinks ) +template +void Straight_skeleton_builder_2::RelinkBisectorsAroundMultinode( Vertex_handle const& v0, Halfedge_handle_vector& aLinks ) { CGAL_assertion( aLinks.size() > 0 ) ; @@ -1498,8 +1498,8 @@ void Straight_skeleton_builder_2::RelinkBisectorsAroundMultinode( Verte } -template -void Straight_skeleton_builder_2::PreprocessMultinode( Multinode& aMN ) +template +void Straight_skeleton_builder_2::PreprocessMultinode( Multinode& aMN ) { // // A Multinode is a run of coincident nodes along a face. @@ -1555,8 +1555,8 @@ void Straight_skeleton_builder_2::PreprocessMultinode( Multinode& aMN ) // Replaces a run of coincident nodes with a single one by removing all but the first, remvong node-to-node bisectors and // relinking the other bisectors. // -template -void Straight_skeleton_builder_2::ProcessMultinode( Multinode& aMN +template +void Straight_skeleton_builder_2::ProcessMultinode( Multinode& aMN , Halfedge_handle_vector& rBisectorsToRemove , Vertex_handle_vector& rNodesToRemove ) @@ -1593,9 +1593,9 @@ void Straight_skeleton_builder_2::ProcessMultinode( Multinode& } -template -typename Straight_skeleton_builder_2::MultinodePtr -Straight_skeleton_builder_2::CreateMultinode( Halfedge_handle begin, Halfedge_handle end ) +template +typename Straight_skeleton_builder_2::MultinodePtr +Straight_skeleton_builder_2::CreateMultinode( Halfedge_handle begin, Halfedge_handle end ) { return MultinodePtr( new Multinode(begin,end) ); } @@ -1626,8 +1626,8 @@ Straight_skeleton_builder_2::CreateMultinode( Halfedge_handle begin, Ha // at the same time and point. IOW, 2 nodes are coincident if they represent the simultaneous // coallison of exactly 4 edges (the union of 2 triedges with 2 common elements is a set of 4). // -template -void Straight_skeleton_builder_2::MergeCoincidentNodes() +template +void Straight_skeleton_builder_2::MergeCoincidentNodes() { // // NOTE: This code might be executed on a topologically incosistent HDS, thus the need to check @@ -1729,8 +1729,8 @@ void Straight_skeleton_builder_2::MergeCoincidentNodes() EraseNode(*vi); } -template -bool Straight_skeleton_builder_2::FinishUp() +template +bool Straight_skeleton_builder_2::FinishUp() { CGAL_STSKEL_BUILDER_TRACE(0, "\n\nFinishing up..."); @@ -1738,12 +1738,12 @@ bool Straight_skeleton_builder_2::FinishUp() std::for_each( mSplitNodes.begin() ,mSplitNodes.end () - ,boost::bind(&Straight_skeleton_builder_2::MergeSplitNodes,this,_1) + ,boost::bind(&Straight_skeleton_builder_2::MergeSplitNodes,this,_1) ) ; std::for_each( mDanglingBisectors.begin() ,mDanglingBisectors.end () - ,boost::bind(&Straight_skeleton_builder_2::EraseBisector,this,_1) + ,boost::bind(&Straight_skeleton_builder_2::EraseBisector,this,_1) ) ; MergeCoincidentNodes(); @@ -1753,16 +1753,16 @@ bool Straight_skeleton_builder_2::FinishUp() return mSSkel->is_valid() ; } -template -bool Straight_skeleton_builder_2::Run() +template +bool Straight_skeleton_builder_2::Run() { InitPhase(); Propagate(); return FinishUp(); } -template -typename Straight_skeleton_builder_2::SSkelPtr Straight_skeleton_builder_2::construct_skeleton( bool aNull_if_failed ) +template +typename Straight_skeleton_builder_2::SSkelPtr Straight_skeleton_builder_2::construct_skeleton( bool aNull_if_failed ) { bool ok = false ;