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

macro renaming

This commit is contained in:
Sébastien Loriot 2012-11-02 08:44:08 +00:00
parent 211282d20b
commit 6ff851e791
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Triangulation_2/include/CGAL/Constrained_Delaunay_triangulation_2.h
View File

@ -521,7 +521,7 @@ flip_around(List_vertices& new_vertices)
} }
#ifndef CGAL_DT2_USE_RECURSIVE_PROPAGATING_FLIP #ifndef CGAL_CDT2_USE_RECURSIVE_PROPAGATING_FLIP
template <class Gt, class Tds, class Itag > template <class Gt, class Tds, class Itag >
void void
Constrained_Delaunay_triangulation_2<Gt,Tds,Itag>:: Constrained_Delaunay_triangulation_2<Gt,Tds,Itag>::
@ -551,7 +551,7 @@ Constrained_Delaunay_triangulation_2<Gt,Tds,Itag>::
propagating_flip(Face_handle f,int i, int depth) propagating_flip(Face_handle f,int i, int depth)
{ {
if (!is_flipable(f,i)) return; if (!is_flipable(f,i)) return;
#ifdef CGAL_DT2_IMMEDIATELY_NON_RECURSIVE_PROPAGATING_FLIP #ifdef CGAL_CDT2_IMMEDIATELY_NON_RECURSIVE_PROPAGATING_FLIP
non_recursive_propagating_flip(f,i); non_recursive_propagating_flip(f,i);
#else #else
int max_depth = 100; int max_depth = 100;

10
Triangulation_2/include/CGAL/Delaunay_triangulation_2.h
View File

@ -175,7 +175,7 @@ public:
#endif #endif
private: private:
#ifndef CGAL_USE_DT2_RECURSIVE_PROPAGATING_FLIP #ifndef CGAL_DT2_USE_RECURSIVE_PROPAGATING_FLIP
void non_recursive_propagating_flip(Face_handle f,int i); void non_recursive_propagating_flip(Face_handle f,int i);
void propagating_flip(const Face_handle& f,int i, int depth=0); void propagating_flip(const Face_handle& f,int i, int depth=0);
#else #else
@ -445,7 +445,7 @@ private:
#ifdef CGAL_TRIANGULATION_2_USE_OLD_PROPAGATE_CONFLICTS #ifdef CGAL_DT2_USE_RECURSIVE_PROPAGATE_CONFLICTS
template <class OutputItFaces, class OutputItBoundaryEdges> template <class OutputItFaces, class OutputItBoundaryEdges>
std::pair<OutputItFaces,OutputItBoundaryEdges> std::pair<OutputItFaces,OutputItBoundaryEdges>
propagate_conflicts (const Point &p, propagate_conflicts (const Point &p,
@ -464,7 +464,7 @@ private:
} }
return pit; return pit;
} }
#else // NO CGAL_TRIANGULATION_2_USE_OLD_PROPAGATE_CONFLICTS #else // NO CGAL_DT2_USE_RECURSIVE_PROPAGATE_CONFLICTS
template <class OutputItFaces, class OutputItBoundaryEdges> template <class OutputItFaces, class OutputItBoundaryEdges>
std::pair<OutputItFaces,OutputItBoundaryEdges> std::pair<OutputItFaces,OutputItBoundaryEdges>
non_recursive_propagate_conflicts ( const Point &p, non_recursive_propagate_conflicts ( const Point &p,
@ -515,7 +515,7 @@ private:
} }
return pit; return pit;
} }
#endif // NO CGAL_TRIANGULATION_2_USE_OLD_PROPAGATE_CONFLICTS #endif // NO CGAL_DT2_USE_RECURSIVE_PROPAGATE_CONFLICTS
protected: protected:
@ -936,7 +936,7 @@ restore_Delaunay(Vertex_handle v)
return; return;
} }
#ifndef CGAL_USE_DT2_RECURSIVE_PROPAGATING_FLIP #ifndef CGAL_DT2_USE_RECURSIVE_PROPAGATING_FLIP
template < class Gt, class Tds > template < class Gt, class Tds >
void void
Delaunay_triangulation_2<Gt,Tds>:: Delaunay_triangulation_2<Gt,Tds>::