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

add missing namespaces for msvc2015 

avoid ambiguity of calls
This commit is contained in:
Jane Tournois 2015-08-11 15:47:20 +02:00
parent c19d370265
commit feb76b7439
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Circular_kernel_3/test/Circular_kernel_3/include/CGAL/_test_sphere_constructions.h
View File

@ -756,7 +756,7 @@ void _test_intersection_construct(SK sk) {
intersection(s1, s2, sl, std::back_inserter(intersection_1)); intersection(s1, s2, sl, std::back_inserter(intersection_1));
intersection(s1, s3, sl, std::back_inserter(intersection_2)); intersection(s1, s3, sl, std::back_inserter(intersection_2));
if(intersection_1.size() == 1) { if(intersection_1.size() == 1) {
assert(do_intersect(s1, s2, sl)); assert(CGAL::do_intersect(s1, s2, sl));
Circle_3 circle; Circle_3 circle;
std::pair<Circular_arc_point_3, unsigned> cap; std::pair<Circular_arc_point_3, unsigned> cap;
if(assign(circle,intersection_1[0])) { if(assign(circle,intersection_1[0])) {
@ -772,7 +772,7 @@ void _test_intersection_construct(SK sk) {
} }
} }
if(intersection_1.size() == 2) { if(intersection_1.size() == 2) {
assert(do_intersect(s1, s2, sl)); assert(CGAL::do_intersect(s1, s2, sl));
std::pair<Circular_arc_point_3, unsigned> cap1, cap2; std::pair<Circular_arc_point_3, unsigned> cap1, cap2;
assert(assign(cap1,intersection_1[0])); assert(assign(cap1,intersection_1[0]));
assert(assign(cap2,intersection_1[1])); assert(assign(cap2,intersection_1[1]));
@ -785,7 +785,7 @@ void _test_intersection_construct(SK sk) {
} }
if(intersection_2.size() == 1) { if(intersection_2.size() == 1) {
assert(do_intersect(s1, s3, sl)); assert(CGAL::do_intersect(s1, s3, sl));
Circle_3 circle; Circle_3 circle;
std::pair<Circular_arc_point_3, unsigned> cap; std::pair<Circular_arc_point_3, unsigned> cap;
if(assign(circle,intersection_2[0])) { if(assign(circle,intersection_2[0])) {
@ -801,7 +801,7 @@ void _test_intersection_construct(SK sk) {
} }
} }
if(intersection_2.size() == 2) { if(intersection_2.size() == 2) {
assert(do_intersect(s1, s3, sl)); assert(CGAL::do_intersect(s1, s3, sl));
// This case must never happen // This case must never happen
std::pair<Circular_arc_point_3, unsigned> cap1, cap2; std::pair<Circular_arc_point_3, unsigned> cap1, cap2;
assert(assign(cap1,intersection_2[0])); assert(assign(cap1,intersection_2[0]));

4
Kernel_23/include/CGAL/internal/Projection_traits_3.h
View File

@ -376,12 +376,12 @@ class Circumcenter_center_projected
public: public:
Point_3 operator() (const Point_3& p1,const Point_3& p2) const Point_3 operator() (const Point_3& p1,const Point_3& p2) const
{ {
return embed( circumcenter(project(p1),project(p2)) ); return embed( CGAL::circumcenter(project(p1),project(p2)) );
} }
Point_3 operator() (const Point_3& p1,const Point_3& p2,const Point_3& p3) const Point_3 operator() (const Point_3& p1,const Point_3& p2,const Point_3& p3) const
{ {
return embed( circumcenter(project(p1),project(p2),project(p3)) ); return embed( CGAL::circumcenter(project(p1),project(p2),project(p3)) );
} }
}; };

2
Kernel_23/test/Kernel_23/issue_129.cpp
View File

@ -27,7 +27,7 @@ int main()
{ {
try { try {
CGAL::Point_3<CGAL::Epick> a, b, c, d; CGAL::Point_3<CGAL::Epick> a, b, c, d;
squared_radius(a, b, c, d); CGAL::squared_radius(a, b, c, d);
} catch(...) {} } catch(...) {}
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }