diff --git a/Boolean_set_operations_2/demo/Boolean_set_operations_2/Qt_widget_X_monotone_circle_segment_2.h b/Boolean_set_operations_2/demo/Boolean_set_operations_2/Qt_widget_X_monotone_circle_segment_2.h index 92185d2a52d..10fba4ca10d 100644 --- a/Boolean_set_operations_2/demo/Boolean_set_operations_2/Qt_widget_X_monotone_circle_segment_2.h +++ b/Boolean_set_operations_2/demo/Boolean_set_operations_2/Qt_widget_X_monotone_circle_segment_2.h @@ -35,13 +35,13 @@ operator<<(CGAL::Qt_widget & widget, if(arc.is_linear()) { typedef Simple_cartesian DK; - typedef DK::Segment_2 DS; + typedef DK::Segment_2 DS_; typedef DK::Point_2 DP; double sx = CGAL::to_double(arc.source().x()); double sy = CGAL::to_double(arc.source().y()); double tx = CGAL::to_double(arc.target().x()); double ty = CGAL::to_double(arc.target().y()); - DS seg(DP(sx ,sy), DP(tx, ty)); + DS_ seg(DP(sx ,sy), DP(tx, ty)); widget << seg; return (widget); } diff --git a/Boolean_set_operations_2/demo/Boolean_set_operations_2/Qt_widget_circle_segment_2.h b/Boolean_set_operations_2/demo/Boolean_set_operations_2/Qt_widget_circle_segment_2.h index 5f7f7ae4463..aa0df45b760 100644 --- a/Boolean_set_operations_2/demo/Boolean_set_operations_2/Qt_widget_circle_segment_2.h +++ b/Boolean_set_operations_2/demo/Boolean_set_operations_2/Qt_widget_circle_segment_2.h @@ -35,13 +35,13 @@ operator<<(CGAL::Qt_widget & widget, if(arc.orientation() == COLLINEAR) { typedef Simple_cartesian DK; - typedef DK::Segment_2 DS; + typedef DK::Segment_2 DS_; typedef DK::Point_2 DP; double sx = CGAL::to_double(arc.source().x()); double sy = CGAL::to_double(arc.source().y()); double tx = CGAL::to_double(arc.target().x()); double ty = CGAL::to_double(arc.target().y()); - DS seg(DP(sx ,sy), DP(tx, ty)); + DS_ seg(DP(sx ,sy), DP(tx, ty)); widget << seg; return (widget); } diff --git a/Jet_fitting_3/demo/Jet_fitting_3/SketchSample.cpp b/Jet_fitting_3/demo/Jet_fitting_3/SketchSample.cpp index a06b9c18fd5..7373b94f658 100644 --- a/Jet_fitting_3/demo/Jet_fitting_3/SketchSample.cpp +++ b/Jet_fitting_3/demo/Jet_fitting_3/SketchSample.cpp @@ -6,7 +6,7 @@ #include "SketchSample.h" -SketchSample::SketchSample(Mesh* mesh, DS* ppal_data) { +SketchSample::SketchSample(Mesh* mesh, DS_* ppal_data) { highlight = false; p_mesh = mesh; p_ppal_data = ppal_data; @@ -111,7 +111,7 @@ const double* SketchSample::rcoord() { // //move to sketch // void draw_point(Point& P); // void draw_vector(Point& P, Vector& V); -// void MakeCallList(DS& L); +// void MakeCallList(DS_& L); void SketchSample::draw_point(Point& P) diff --git a/Jet_fitting_3/demo/Jet_fitting_3/SketchSample.h b/Jet_fitting_3/demo/Jet_fitting_3/SketchSample.h index d4b3515b389..c6e95c58fe3 100644 --- a/Jet_fitting_3/demo/Jet_fitting_3/SketchSample.h +++ b/Jet_fitting_3/demo/Jet_fitting_3/SketchSample.h @@ -23,7 +23,7 @@ struct data_line{ {}; }; -typedef std::list DS; +typedef std::list DS_; typedef std::list::iterator DS_iterator; @@ -32,10 +32,10 @@ class SketchSample : public Sketcher { private: bool highlight; Mesh* p_mesh; - DS* p_ppal_data; + DS_* p_ppal_data; public: - SketchSample(Mesh* mesh, DS* ppal_data); + SketchSample(Mesh* mesh, DS_* ppal_data); ~SketchSample(); diff --git a/Jet_fitting_3/demo/Jet_fitting_3/visu.cpp b/Jet_fitting_3/demo/Jet_fitting_3/visu.cpp index ae724885f6a..b05ed174fcd 100644 --- a/Jet_fitting_3/demo/Jet_fitting_3/visu.cpp +++ b/Jet_fitting_3/demo/Jet_fitting_3/visu.cpp @@ -15,9 +15,9 @@ #include Mesh m_mesh; -DS ppal_data; +DS_ ppal_data; -void clean_DS(DS& L) +void clean_DS(DS_& L) { DS_iterator current=L.begin(); for (DS_iterator it=++L.begin();it!=L.end();it++) @@ -46,7 +46,7 @@ read_line(FILE* file, Point& P1,Point& P2, fscanf(file, "%lf%lf",&k1,&k2); } -void load_data_from_file(DS& l, const char* file_res) +void load_data_from_file(DS_& l, const char* file_res) { FILE *file; if((file = fopen(file_res, "r")) != NULL) 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 5a76f1bc24a..65734601869 100644 --- a/Kinetic_data_structures/test/Kinetic_data_structures/random_kds.cpp +++ b/Kinetic_data_structures/test/Kinetic_data_structures/random_kds.cpp @@ -30,11 +30,11 @@ int main(int, char *[]) { if (which ==0) { std::cout << "Checking Delaunay_2" << std::endl; typedef CGAL::Kinetic::Exact_simulation_traits Traits; - typedef CGAL::Kinetic::Delaunay_triangulation_2 DS; + typedef CGAL::Kinetic::Delaunay_triangulation_2 DS_; typedef Traits::Kinetic_kernel::Motion_function F; typedef Traits::Kinetic_kernel::Point_2 Point; Traits tr(0, end_time); - DS ds(tr); + DS_ ds(tr); std::cout << "Points are:\n"; for (int i=0; i< nump/1.5; ++i){ @@ -58,11 +58,11 @@ int main(int, char *[]) { std::cout << "Checking Sort" << std::endl; typedef CGAL::Kinetic::Exact_simulation_traits Traits; - typedef CGAL::Kinetic::Sort DS; + typedef CGAL::Kinetic::Sort DS_; typedef Traits::Kinetic_kernel::Motion_function F; typedef Traits::Kinetic_kernel::Point_1 Point; Traits tr(0, end_time); - DS ds(tr); + DS_ ds(tr); std::cout << "Points are:\n"; for (int i=0; i< nump; ++i){ Point pt(rp(r, r.get_int(0,5))); @@ -85,11 +85,11 @@ int main(int, char *[]) { } else if (which == 2) { std::cout << "Checking Delaunay_3" << std::endl; typedef CGAL::Kinetic::Exact_simulation_traits Traits; - typedef CGAL::Kinetic::Delaunay_triangulation_3 DS; + typedef CGAL::Kinetic::Delaunay_triangulation_3 DS_; typedef Traits::Kinetic_kernel::Motion_function F; typedef Traits::Kinetic_kernel::Point_3 Point; Traits tr(0, end_time); - DS ds(tr); + DS_ ds(tr); std::cout << "Points are:\n"; for (int i=0; i< nump/2; ++i){ Point pt(rp(r, r.get_int(0,3)), @@ -114,12 +114,12 @@ int main(int, char *[]) { } else { std::cout << "Checking regular_3" << std::endl; typedef CGAL::Kinetic::Regular_triangulation_exact_simulation_traits Traits; - typedef CGAL::Kinetic::Regular_triangulation_3 DS; + typedef CGAL::Kinetic::Regular_triangulation_3 DS_; typedef Traits::Kinetic_kernel::Motion_function F; typedef Traits::Kinetic_kernel::Point_3 Bare_point; typedef Traits::Kinetic_kernel::Weighted_point_3 Point; Traits tr(0, end_time); - DS ds(tr); + DS_ ds(tr); std::cout << "Points are:\n"; for (int i=0; i< nump/2; ++i){ diff --git a/Ridges_3/demo/Ridges_3/SketchSample.cpp b/Ridges_3/demo/Ridges_3/SketchSample.cpp index 59f93d71f0e..9e04ee58467 100644 --- a/Ridges_3/demo/Ridges_3/SketchSample.cpp +++ b/Ridges_3/demo/Ridges_3/SketchSample.cpp @@ -10,7 +10,7 @@ extern double strength_threshold; extern double sharpness_threshold; -SketchSample::SketchSample(Mesh* mesh, DS* ridge_data) { +SketchSample::SketchSample(Mesh* mesh, DS_* ridge_data) { highlight = false; p_mesh = mesh; p_ridge_data = ridge_data; diff --git a/Ridges_3/demo/Ridges_3/SketchSample.h b/Ridges_3/demo/Ridges_3/SketchSample.h index ff1ad81943b..33ded995970 100644 --- a/Ridges_3/demo/Ridges_3/SketchSample.h +++ b/Ridges_3/demo/Ridges_3/SketchSample.h @@ -30,7 +30,7 @@ struct data_line{ {}; }; -typedef std::list DS; +typedef std::list DS_; typedef std::list::iterator DS_iterator; @@ -38,11 +38,11 @@ class SketchSample : public Sketcher { private: bool highlight; Mesh* p_mesh; - DS* p_ridge_data; + DS_* p_ridge_data; double mesh_center_x, mesh_center_y, mesh_center_z, mesh_radius; public: - SketchSample(Mesh* mesh, DS* ridge_data); + SketchSample(Mesh* mesh, DS_* ridge_data); ~SketchSample(); diff --git a/Ridges_3/demo/Ridges_3/visu.cpp b/Ridges_3/demo/Ridges_3/visu.cpp index 23972979517..16cf631fdac 100644 --- a/Ridges_3/demo/Ridges_3/visu.cpp +++ b/Ridges_3/demo/Ridges_3/visu.cpp @@ -17,11 +17,11 @@ #include Mesh m_mesh; -DS ridge_data; +DS_ ridge_data; double strength_threshold = 0; double sharpness_threshold = 0; -void clean_DS(DS& L) +void clean_DS(DS_& L) { DS_iterator current=L.begin(); for (DS_iterator it=++L.begin();it!=L.end();it++) @@ -66,7 +66,7 @@ read_line(std::ifstream& stream_res, int& ridge_type, } } -void load_data_from_file(DS& l, const char* file_res) +void load_data_from_file(DS_& l, const char* file_res) { std::ifstream stream_res(file_res, std::ifstream::in); if(!stream_res) { exit(0); } diff --git a/Segment_Delaunay_graph_2/demo/Segment_Delaunay_graph_2/include/Which_diagram.h b/Segment_Delaunay_graph_2/demo/Segment_Delaunay_graph_2/include/Which_diagram.h index b1081930a86..814b15f97c4 100644 --- a/Segment_Delaunay_graph_2/demo/Segment_Delaunay_graph_2/include/Which_diagram.h +++ b/Segment_Delaunay_graph_2/demo/Segment_Delaunay_graph_2/include/Which_diagram.h @@ -28,14 +28,14 @@ CGAL_BEGIN_NAMESPACE template struct Which_diagram; -template -struct Which_diagram< Segment_Delaunay_graph_2 > +template +struct Which_diagram< Segment_Delaunay_graph_2 > { typedef Tag_false Is_hierarchy; }; -template -struct Which_diagram< Segment_Delaunay_graph_hierarchy_2 > +template +struct Which_diagram< Segment_Delaunay_graph_hierarchy_2 > { typedef Tag_true Is_hierarchy; }; diff --git a/Segment_Delaunay_graph_2/demo/Segment_Delaunay_graph_2/pdg_typedefs.h b/Segment_Delaunay_graph_2/demo/Segment_Delaunay_graph_2/pdg_typedefs.h index 2e539a4ea46..5f4dbd6d133 100644 --- a/Segment_Delaunay_graph_2/demo/Segment_Delaunay_graph_2/pdg_typedefs.h +++ b/Segment_Delaunay_graph_2/demo/Segment_Delaunay_graph_2/pdg_typedefs.h @@ -78,11 +78,11 @@ typedef CGAL::Segment_Delaunay_graph_vertex_base_2 Vb; typedef CGAL::Segment_Delaunay_graph_vertex_base_with_info_2 Vbi; typedef CGAL::Segment_Delaunay_graph_hierarchy_vertex_base_2 Vbh; typedef CGAL::Triangulation_face_base_2 Fb; -typedef CGAL::Triangulation_data_structure_2 DS; +typedef CGAL::Triangulation_data_structure_2 DS_; -typedef CGAL::Segment_Delaunay_graph_hierarchy_2 SDG_2; -//typedef CGAL::Segment_Delaunay_graph_2 SDG_2; +typedef CGAL::Segment_Delaunay_graph_hierarchy_2 SDG_2; +//typedef CGAL::Segment_Delaunay_graph_2 SDG_2; #endif // PDG_TYPEDEFS_H