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

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'
This commit is contained in:
Laurent Rineau 2010-08-13 16:14:29 +00:00
parent 210578c95a
commit 99d011165e
1 changed files with 4 additions and 4 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 else
inp >> pwh2; inp >> pwh2;
if (type1 == 0 && type2 == 0) return test(inp, p1 ,p2); if (type1 == 0 && type2 == 0) return ::test(inp, p1 ,p2);
if (type1 == 0 && type2 == 1) return test(inp, p1 ,pwh2); if (type1 == 0 && type2 == 1) return ::test(inp, p1 ,pwh2);
if (type1 == 1 && type2 == 0) return test(inp, pwh1, p2); if (type1 == 1 && type2 == 0) return ::test(inp, pwh1, p2);
if (type1 == 1 && type2 == 1) return test(inp, pwh1, pwh2); if (type1 == 1 && type2 == 1) return ::test(inp, pwh1, pwh2);
return false; return false;
} }