From bff4e98d012c84aa319dafd94420cbfef63eaabb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 24 Jun 2013 07:56:17 +0200 Subject: [PATCH] fix warnings mainly coming from the merge of the replace object feature branch --- AABB_tree/test/AABB_tree/AABB_test_util.h | 6 ++---- AABB_tree/test/AABB_tree/aabb_any_all_benchmark.cpp | 2 -- .../include/CGAL/Intersections_3/intersection_3_1_impl.h | 8 +++----- .../read_test_with_different_pmaps.cpp | 2 +- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/AABB_tree/test/AABB_tree/AABB_test_util.h b/AABB_tree/test/AABB_tree/AABB_test_util.h index c301fdb4e0c..5449bd1e488 100644 --- a/AABB_tree/test/AABB_tree/AABB_test_util.h +++ b/AABB_tree/test/AABB_tree/AABB_test_util.h @@ -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 optional_object_and_primitive; + typedef typename Tree::Object_and_primitive_id Object_and_primitive_id; + boost::optional 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); diff --git a/AABB_tree/test/AABB_tree/aabb_any_all_benchmark.cpp b/AABB_tree/test/AABB_tree/aabb_any_all_benchmark.cpp index 03d9df3aadc..2566c927be4 100644 --- a/AABB_tree/test/AABB_tree/aabb_any_all_benchmark.cpp +++ b/AABB_tree/test/AABB_tree/aabb_any_all_benchmark.cpp @@ -65,9 +65,7 @@ boost::tuple 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 Polyhedron; typedef CGAL::AABB_FaceGraph_triangle_primitive Primitive; diff --git a/Intersections_3/include/CGAL/Intersections_3/intersection_3_1_impl.h b/Intersections_3/include/CGAL/Intersections_3/intersection_3_1_impl.h index 47e9d46a219..a54fa13c5d2 100644 --- a/Intersections_3/include/CGAL/Intersections_3/intersection_3_1_impl.h +++ b/Intersections_3/include/CGAL/Intersections_3/intersection_3_1_impl.h @@ -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 > - #endif - result_type; + result_type; + #endif typedef typename K::Point_3 Point_3; diff --git a/Point_set_processing_3/test/Point_set_processing_3/read_test_with_different_pmaps.cpp b/Point_set_processing_3/test/Point_set_processing_3/read_test_with_different_pmaps.cpp index acd044e65dc..2d6ad5457fc 100644 --- a/Point_set_processing_3/test/Point_set_processing_3/read_test_with_different_pmaps.cpp +++ b/Point_set_processing_3/test/Point_set_processing_3/read_test_with_different_pmaps.cpp @@ -340,4 +340,4 @@ int main() { compile_test(); return EXIT_SUCCESS; -} \ No newline at end of file +}