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

fix warnings mainly coming from the merge of the replace object feature branch

This commit is contained in:
Sébastien Loriot 2013-06-24 07:56:17 +02:00
parent f6c016257d
commit bff4e98d01
4 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
AABB_tree/test/AABB_tree/AABB_test_util.h
View File

@ -70,11 +70,8 @@ void test_all_intersection_query_types(Tree& tree)
typedef typename K::Ray_3 Ray;
typedef typename K::Line_3 Line;
typedef typename K::Point_3 Point;
// typedef typename K::Vector_3 Vector;
typedef typename K::Segment_3 Segment;
typedef typename Tree::Primitive Primitive;
// typedef typename Tree::Point_and_primitive_id Point_and_primitive_id;
typedef typename Tree::Object_and_primitive_id Object_and_primitive_id;
Point p((FT)-0.5, (FT)-0.5, (FT)-0.5);
Point q((FT) 0.5, (FT) 0.5, (FT) 0.5);
@ -102,7 +99,8 @@ void test_all_intersection_query_types(Tree& tree)
// any_intersection
#if CGAL_INTERSECTION_VERSION < 2
boost::optional<Object_and_primitive_id> optional_object_and_primitive;
typedef typename Tree::Object_and_primitive_id Object_and_primitive_id;
boost::optional<Z> optional_object_and_primitive;
optional_object_and_primitive = tree.any_intersection(ray);
optional_object_and_primitive = tree.any_intersection(line);
optional_object_and_primitive = tree.any_intersection(segment);

2
AABB_tree/test/AABB_tree/aabb_any_all_benchmark.cpp
View File

@ -65,9 +65,7 @@ boost::tuple<std::size_t, std::size_t, std::size_t, long> test(const char* name)
typedef typename K::Ray_3 Ray;
typedef typename K::Line_3 Line;
typedef typename K::Point_3 Point;
typedef typename K::Vector_3 Vector;
typedef typename K::Segment_3 Segment;
typedef typename K::Triangle_3 Triangle;
typedef CGAL::Polyhedron_3<K> Polyhedron;
typedef CGAL::AABB_FaceGraph_triangle_primitive<const Polyhedron> Primitive;

6
Intersections_3/include/CGAL/Intersections_3/intersection_3_1_impl.h
View File

@ -270,16 +270,14 @@ intersection(const typename K::Plane_3 &plane1,
const typename K::Plane_3 &plane3,
const K& k)
{
#if CGAL_INTERSECTION_VERSION > 1
typedef
#if CGAL_INTERSECTION_VERSION < 2
CGAL::Object
#else
typename boost::optional<
boost::variant<typename K::Point_3,
typename K::Line_3,
typename K::Plane_3> >
#endif
result_type;
#endif
typedef typename K::Point_3 Point_3;