From 0b83562ef1e6c30867bc8dc03334e2fa29ab8ed2 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 18 Aug 2010 20:59:25 +0000 Subject: [PATCH] Backport from trunk, fixes to the testsuite: | ------------------------------------------------------------------------ | r58061 | lrineau | 2010-08-13 18:14:29 +0200 (Fri, 13 Aug 2010) | 8 lines | Changed paths: | M /trunk/Boolean_set_operations_2/test/Boolean_set_operations_2/test_bop.cpp | | Use a full-qualified name, because a of conflict with something from Boost. | | Old error log: | /home/lrineau/CGAL/boost/1.44-beta1/include/boost/type_traits/has_new_operator.hpp: In function 'bool test_one_file(std::ifstream&)': | /home/lrineau/CGAL/boost/1.44-beta1/include/boost/type_traits/has_new_operator.hpp:24: error: 'template struct boost::detail::test' is not a function, | /home/lrineau/CGAL/CGAL-3.7-I-135/cmake/platforms/x86-64_Linux-2.6_g++-4.4.4_F13-MATCHING-BUG-6/test/Boolean_set_operations_2/test_bop.cpp:137: error: conflict with 'template bool test(std::istream&, const Polygon1&, const Polygon2&)' | /home/lrineau/CGAL/CGAL-3.7-I-135/cmake/platforms/x86-64_Linux-2.6_g++-4.4.4_F13-MATCHING-BUG-6/test/Boolean_set_operations_2/test_bop.cpp:386: error: in call to 'test' | | ------------------------------------------------------------------------ | r58062 | lrineau | 2010-08-13 18:19:37 +0200 (Fri, 13 Aug 2010) | 8 lines | Changed paths: | M /trunk/Min_sphere_of_spheres_d/test/Min_sphere_of_spheres_d/interface_check.cpp | | Use a fully-qualified name for ::test, because otherwise there is a | conflict with something from Boost: | | /home/lrineau/CGAL/boost/1.44-beta1/include/boost/type_traits/has_new_operator.hpp: In function 'int main()': | /home/lrineau/CGAL/boost/1.44-beta1/include/boost/type_traits/has_new_operator.hpp:24: error: 'template struct boost::detail::test' is not a function, | /home/lrineau/CGAL/CGAL-3.7-I-135/cmake/platforms/x86-64_Linux-2.6_g++-4.4.4_F13-MATCHING-BUG-6/test/Min_sphere_of_spheres_d/interface_check.cpp:147: error: conflict with 'template void test(int, const FT&)' | /home/lrineau/CGAL/CGAL-3.7-I-135/cmake/platforms/x86-64_Linux-2.6_g++-4.4.4_F13-MATCHING-BUG-6/test/Min_sphere_of_spheres_d/interface_check.cpp:210: error: in call to 'test' | | ------------------------------------------------------------------------ --- .../Boolean_set_operations_2/test_bop.cpp | 8 ++-- .../interface_check.cpp | 48 +++++++++---------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Boolean_set_operations_2/test/Boolean_set_operations_2/test_bop.cpp b/Boolean_set_operations_2/test/Boolean_set_operations_2/test_bop.cpp index 246cdd25c34..e4e420178b5 100644 --- a/Boolean_set_operations_2/test/Boolean_set_operations_2/test_bop.cpp +++ b/Boolean_set_operations_2/test/Boolean_set_operations_2/test_bop.cpp @@ -383,10 +383,10 @@ bool test_one_file(std::ifstream & inp) else inp >> pwh2; - if (type1 == 0 && type2 == 0) return test(inp, p1 ,p2); - if (type1 == 0 && type2 == 1) return test(inp, p1 ,pwh2); - if (type1 == 1 && type2 == 0) return test(inp, pwh1, p2); - if (type1 == 1 && type2 == 1) return test(inp, pwh1, pwh2); + if (type1 == 0 && type2 == 0) return ::test(inp, p1 ,p2); + if (type1 == 0 && type2 == 1) return ::test(inp, p1 ,pwh2); + if (type1 == 1 && type2 == 0) return ::test(inp, pwh1, p2); + if (type1 == 1 && type2 == 1) return ::test(inp, pwh1, pwh2); return false; } diff --git a/Min_sphere_of_spheres_d/test/Min_sphere_of_spheres_d/interface_check.cpp b/Min_sphere_of_spheres_d/test/Min_sphere_of_spheres_d/interface_check.cpp index 6cbf9ec1074..634f9ad7175 100644 --- a/Min_sphere_of_spheres_d/test/Min_sphere_of_spheres_d/interface_check.cpp +++ b/Min_sphere_of_spheres_d/test/Min_sphere_of_spheres_d/interface_check.cpp @@ -207,44 +207,44 @@ int main () { const float tf = 5.0e-7f; // tolerance for float computation cout << "test exact LP-algorithm with sqrts:" << endl; - test<2,FieldType,CGAL::Tag_true,CGAL::LP_algorithm>(N,T); - test<3,FieldType,CGAL::Tag_true,CGAL::LP_algorithm>(N,T); - test<5,FieldType,CGAL::Tag_true,CGAL::LP_algorithm>(N,T); + ::test<2,FieldType,CGAL::Tag_true,CGAL::LP_algorithm>(N,T); + ::test<3,FieldType,CGAL::Tag_true,CGAL::LP_algorithm>(N,T); + ::test<5,FieldType,CGAL::Tag_true,CGAL::LP_algorithm>(N,T); cout << "test exact LP-algorithm without sqrts:" << endl; - test<2,FieldType,CGAL::Tag_false,CGAL::LP_algorithm>(N,T); - test<3,FieldType,CGAL::Tag_false,CGAL::LP_algorithm>(N,T); - test<5,FieldType,CGAL::Tag_false,CGAL::LP_algorithm>(N,T); + ::test<2,FieldType,CGAL::Tag_false,CGAL::LP_algorithm>(N,T); + ::test<3,FieldType,CGAL::Tag_false,CGAL::LP_algorithm>(N,T); + ::test<5,FieldType,CGAL::Tag_false,CGAL::LP_algorithm>(N,T); cout << "test exact farthest-first heuristic with sqrts:" << endl; - test<2,FieldType,CGAL::Tag_true,CGAL::Farthest_first_heuristic>(N,T); - test<3,FieldType,CGAL::Tag_true,CGAL::Farthest_first_heuristic>(N,T); - test<5,FieldType,CGAL::Tag_true,CGAL::Farthest_first_heuristic>(N,T); + ::test<2,FieldType,CGAL::Tag_true,CGAL::Farthest_first_heuristic>(N,T); + ::test<3,FieldType,CGAL::Tag_true,CGAL::Farthest_first_heuristic>(N,T); + ::test<5,FieldType,CGAL::Tag_true,CGAL::Farthest_first_heuristic>(N,T); cout << "test exact farthest-first heuristic without sqrts:" << endl; - test<2,FieldType,CGAL::Tag_false,CGAL::Farthest_first_heuristic>(N,T); - test<3,FieldType,CGAL::Tag_false,CGAL::Farthest_first_heuristic>(N,T); - test<5,FieldType,CGAL::Tag_false,CGAL::Farthest_first_heuristic>(N,T); + ::test<2,FieldType,CGAL::Tag_false,CGAL::Farthest_first_heuristic>(N,T); + ::test<3,FieldType,CGAL::Tag_false,CGAL::Farthest_first_heuristic>(N,T); + ::test<5,FieldType,CGAL::Tag_false,CGAL::Farthest_first_heuristic>(N,T); cout << "test double farthest-first heuristic with sqrts:" << endl; - test<2,double,CGAL::Tag_true,CGAL::Farthest_first_heuristic>(N,t); - test<3,double,CGAL::Tag_true,CGAL::Farthest_first_heuristic>(N,t); - test<5,double,CGAL::Tag_true,CGAL::Farthest_first_heuristic>(N,t); + ::test<2,double,CGAL::Tag_true,CGAL::Farthest_first_heuristic>(N,t); + ::test<3,double,CGAL::Tag_true,CGAL::Farthest_first_heuristic>(N,t); + ::test<5,double,CGAL::Tag_true,CGAL::Farthest_first_heuristic>(N,t); cout << "test double farthest-first heuristic without sqrts:" << endl; - test<2,double,CGAL::Tag_false,CGAL::Farthest_first_heuristic>(N,t); - test<3,double,CGAL::Tag_false,CGAL::Farthest_first_heuristic>(N,t); - test<5,double,CGAL::Tag_false,CGAL::Farthest_first_heuristic>(N,t); + ::test<2,double,CGAL::Tag_false,CGAL::Farthest_first_heuristic>(N,t); + ::test<3,double,CGAL::Tag_false,CGAL::Farthest_first_heuristic>(N,t); + ::test<5,double,CGAL::Tag_false,CGAL::Farthest_first_heuristic>(N,t); cout << "test float farthest-first heuristic with sqrts:" << endl; - test<2,float,CGAL::Tag_true,CGAL::Farthest_first_heuristic>(N,tf); - test<3,float,CGAL::Tag_true,CGAL::Farthest_first_heuristic>(N,tf); - test<5,float,CGAL::Tag_true,CGAL::Farthest_first_heuristic>(N,tf); + ::test<2,float,CGAL::Tag_true,CGAL::Farthest_first_heuristic>(N,tf); + ::test<3,float,CGAL::Tag_true,CGAL::Farthest_first_heuristic>(N,tf); + ::test<5,float,CGAL::Tag_true,CGAL::Farthest_first_heuristic>(N,tf); cout << "test float farthest-first heuristic without sqrts:" << endl; - test<2,float,CGAL::Tag_false,CGAL::Farthest_first_heuristic>(N,tf); - test<3,float,CGAL::Tag_false,CGAL::Farthest_first_heuristic>(N,tf); - test<5,float,CGAL::Tag_false,CGAL::Farthest_first_heuristic>(N,tf); + ::test<2,float,CGAL::Tag_false,CGAL::Farthest_first_heuristic>(N,tf); + ::test<3,float,CGAL::Tag_false,CGAL::Farthest_first_heuristic>(N,tf); + ::test<5,float,CGAL::Tag_false,CGAL::Farthest_first_heuristic>(N,tf); cout << endl << "Notice: Because the LP-algorithm is not good when used with" << endl