From ad259f383c24e24b91be11122896f8e33a0c6886 Mon Sep 17 00:00:00 2001 From: Sylvain Pion Date: Thu, 8 Mar 2007 10:24:17 +0000 Subject: [PATCH] constification --- .../test/Segment_Delaunay_graph_2/include/test.h | 10 +++++----- .../test/Segment_Delaunay_graph_2/include/test_info.h | 2 +- .../include/test_info_hierarchy.h | 2 +- .../test/Segment_Delaunay_graph_2/include/test_types.h | 6 +++--- .../Segment_Delaunay_graph_2/test_sdg_traits_2.cpp | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test.h b/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test.h index 2446db41177..29967cb537a 100644 --- a/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test.h +++ b/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test.h @@ -7,7 +7,7 @@ CGAL_BEGIN_NAMESPACE template -bool test_x(InputStream& is, char* ifname, bool test_remove = true) +bool test_x(InputStream& is, const char* ifname, bool test_remove = true) { SDG2 sdg; return test_base(is, sdg, ifname, "sdg.tmp", test_remove); @@ -15,7 +15,7 @@ bool test_x(InputStream& is, char* ifname, bool test_remove = true) template -bool test_no_x(InputStream& is, char* ifname, bool test_remove = true) +bool test_no_x(InputStream& is, const char* ifname, bool test_remove = true) { SDG2_wi sdg; return test_base(is, sdg, ifname, "sdg_wi.tmp", test_remove); @@ -24,7 +24,7 @@ bool test_no_x(InputStream& is, char* ifname, bool test_remove = true) //===================================================================== template -bool test_hierarchy_x(InputStream& is, char* ifname, bool test_remove = true) +bool test_hierarchy_x(InputStream& is, const char* ifname, bool test_remove = true) { SDG2 sdg; return test_base(is, sdg, ifname, "sdgh.tmp", test_remove); @@ -32,7 +32,7 @@ bool test_hierarchy_x(InputStream& is, char* ifname, bool test_remove = true) template -bool test_hierarchy_no_x(InputStream& is, char* ifname, bool test_remove = true) +bool test_hierarchy_no_x(InputStream& is, const char* ifname, bool test_remove = true) { SDG2_wi sdg; return test_base(is, sdg, ifname, "sdgh_wi.tmp", test_remove); @@ -43,7 +43,7 @@ bool test_hierarchy_no_x(InputStream& is, char* ifname, bool test_remove = true) template -bool test_base(InputStream& is, const SDG& sdg, char* ifname, char* ofname, +bool test_base(InputStream& is, const SDG& sdg, const char* ifname, const char* ofname, bool test_remove) { print_separator(); diff --git a/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test_info.h b/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test_info.h index 5aad5a2940d..755f63b89ff 100644 --- a/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test_info.h +++ b/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test_info.h @@ -8,7 +8,7 @@ CGAL_BEGIN_NAMESPACE template -bool test_info(SDG& sdg, char* fname) +bool test_info(SDG& sdg, const char* fname) { CGAL::Random r(static_cast(0)); diff --git a/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test_info_hierarchy.h b/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test_info_hierarchy.h index 544d8d7972a..496c75615f7 100644 --- a/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test_info_hierarchy.h +++ b/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test_info_hierarchy.h @@ -9,7 +9,7 @@ CGAL_BEGIN_NAMESPACE template -bool test_info_hierarchy(SDG& sdg, char* fname) +bool test_info_hierarchy(SDG& sdg, const char* fname) { typedef typename SDG::Finite_vertices_iterator FVIT; diff --git a/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test_types.h b/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test_types.h index 3cd2f5abf0f..8982a38fcb0 100644 --- a/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test_types.h +++ b/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test_types.h @@ -14,7 +14,7 @@ //======================================================================== template -char* get_fname(const NT&, char* ifname) { +char* get_fname(const NT&, const char* ifname) { char* fname = new char[50]; strcpy(fname, "data/"); strcat(fname, ifname); @@ -26,7 +26,7 @@ char* get_fname(const NT&, char* ifname) { #include template<> -char* get_fname(const CGAL::Gmpq&, char* ifname) { +char* get_fname(const CGAL::Gmpq&, const char* ifname) { char* fname = new char[50]; strcpy(fname, "data/"); strcat(fname, ifname); @@ -73,7 +73,7 @@ struct Level_finder< Segment_Delaunay_graph_2 > //======================================================================== template -bool test_sdg(InputStream& is, const SDG&, char* ifname, char* ofname, +bool test_sdg(InputStream& is, const SDG&, const char* ifname, const char* ofname, bool test_remove) { char* ifname_full = get_fname(typename SDG2::Geom_traits::FT(), ifname); diff --git a/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/test_sdg_traits_2.cpp b/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/test_sdg_traits_2.cpp index 70c2b4b0ae5..d4963cc0ff2 100644 --- a/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/test_sdg_traits_2.cpp +++ b/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/test_sdg_traits_2.cpp @@ -193,7 +193,7 @@ struct Get_sites }; template -bool test_traits(char* title) +bool test_traits(const char* title) { typedef typename Gt::Site_2 Site_2; typedef typename Gt::Vertex_conflict_2 Vertex_conflict_2;