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

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<class U, U x> 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<class Polygon1, class Polygon2> 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<class U, U x> 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<int D, class FT, class Sqrt, class Alg> 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'
  | 
  | ------------------------------------------------------------------------
This commit is contained in:
Laurent Rineau 2010-08-18 20:59:25 +00:00
parent 41b2849039
commit 0b83562ef1
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Boolean_set_operations_2/test/Boolean_set_operations_2/test_bop.cpp
View File

@ -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;
}

48
Min_sphere_of_spheres_d/test/Min_sphere_of_spheres_d/interface_check.cpp
View File

@ -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