From dd855e0a435924fb88ade9236e4b1ad7b8242ff7 Mon Sep 17 00:00:00 2001 From: Clement Jamin Date: Mon, 15 Jun 2015 14:26:32 +0200 Subject: [PATCH] Missing "template" --- .../efficient_RANSAC_basic.cpp | 2 +- .../efficient_RANSAC_custom_shape.cpp | 2 +- .../efficient_RANSAC_parameters.cpp | 14 +++++--------- .../efficient_RANSAC_point_access.cpp | 2 +- .../CGAL/Shape_detection_3/Efficient_RANSAC.h | 2 +- .../test_cone_parameters.cpp | 2 +- .../test_cylinders_parameters.cpp | 2 +- .../test_plane_connected_component.cpp | 2 +- .../test_plane_parameters.cpp | 2 +- .../test_sphere_parameters.cpp | 2 +- .../test_torus_parameters.cpp | 2 +- 11 files changed, 15 insertions(+), 19 deletions(-) diff --git a/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_basic.cpp b/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_basic.cpp index 13a7268ae53..fc75cf00342 100644 --- a/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_basic.cpp +++ b/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_basic.cpp @@ -48,7 +48,7 @@ int main() ransac.set_input(points); // Registers planar shapes via template method. - ransac.add_shape_factory(); + ransac.template add_shape_factory(); // Detects registered shapes with default parameters. ransac.detect(); diff --git a/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_custom_shape.cpp b/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_custom_shape.cpp index 3ed53fe77fb..dca729c098a 100644 --- a/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_custom_shape.cpp +++ b/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_custom_shape.cpp @@ -49,7 +49,7 @@ int main() ransac.set_input(points); // Registers planar shapes via template method. - ransac.add_shape_factory(); + ransac.template add_shape_factory(); // Detects registered shapes with default parameters. ransac.detect(); diff --git a/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_parameters.cpp b/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_parameters.cpp index cb1473bfc1b..268727ed106 100644 --- a/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_parameters.cpp +++ b/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_parameters.cpp @@ -57,15 +57,11 @@ int main() ransac.set_input(points); // Register shapes for detection - ransac.add_shape_factory(); - - ransac.add_shape_factory(); - - ransac.add_shape_factory(); - - ransac.add_shape_factory(); - - ransac.add_shape_factory(); + ransac.template add_shape_factory(); + ransac.template add_shape_factory(); + ransac.template add_shape_factory(); + ransac.template add_shape_factory(); + ransac.template add_shape_factory(); // Sets parameters for shape detection. Efficient_ransac::Parameters parameters; diff --git a/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_point_access.cpp b/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_point_access.cpp index 5920b36d264..2fec4a821e2 100644 --- a/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_point_access.cpp +++ b/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_point_access.cpp @@ -52,7 +52,7 @@ int main() ransac.set_input(points); // Registers detection of planes - ransac.add_shape_factory(); + ransac.template add_shape_factory(); // Measures time before setting up the shape detection. CGAL::Timer time; diff --git a/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Efficient_RANSAC.h b/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Efficient_RANSAC.h index b802abe3022..812ca08ff51 100644 --- a/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Efficient_RANSAC.h +++ b/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Efficient_RANSAC.h @@ -217,7 +217,7 @@ shape. The implementation follows \cgalCite{schnabel2007efficient}. /*! Registers in the detection engine the shape type `ShapeType` that must inherit from `Shape_base`. For example, for registering a plane as detectable shape you should call - `add_shape_factory< Shape_detection_3::Plane >();` + `ransac.template add_shape_factory< Shape_detection_3::Plane >();` */ template void add_shape_factory() { diff --git a/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_cone_parameters.cpp b/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_cone_parameters.cpp index ba5fe2f1c27..e2b378c41a4 100644 --- a/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_cone_parameters.cpp +++ b/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_cone_parameters.cpp @@ -48,7 +48,7 @@ bool test_cone_parameters() { Efficient_ransac ransac; - ransac.add_shape_factory(); + ransac.template add_shape_factory(); ransac.set_input(points); diff --git a/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_cylinders_parameters.cpp b/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_cylinders_parameters.cpp index 633457982a2..7310cfc8b03 100644 --- a/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_cylinders_parameters.cpp +++ b/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_cylinders_parameters.cpp @@ -48,7 +48,7 @@ bool test_cylinder_parameters() { Efficient_ransac ransac; - ransac.add_shape_factory(); + ransac.template add_shape_factory(); ransac.set_input(points); diff --git a/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_plane_connected_component.cpp b/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_plane_connected_component.cpp index 0cdf34fab2d..bc7727582f5 100644 --- a/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_plane_connected_component.cpp +++ b/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_plane_connected_component.cpp @@ -52,7 +52,7 @@ bool test_plane_connected_component() { Efficient_ransac ransac; - ransac.add_shape_factory(); + ransac.template add_shape_factory(); ransac.set_input(points); diff --git a/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_plane_parameters.cpp b/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_plane_parameters.cpp index 6789ed091e4..14307a837a0 100644 --- a/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_plane_parameters.cpp +++ b/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_plane_parameters.cpp @@ -46,7 +46,7 @@ bool test_plane_parameters() { Efficient_ransac ransac; - ransac.add_shape_factory(); + ransac.template add_shape_factory(); ransac.set_input(points); diff --git a/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_sphere_parameters.cpp b/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_sphere_parameters.cpp index 47330e40442..d8e3c5a0269 100644 --- a/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_sphere_parameters.cpp +++ b/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_sphere_parameters.cpp @@ -47,7 +47,7 @@ bool test_sphere_parameters() { Efficient_ransac ransac; - ransac.add_shape_factory(); + ransac.template add_shape_factory(); ransac.set_input(points); diff --git a/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_torus_parameters.cpp b/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_torus_parameters.cpp index da3c23391ad..6853b8d89a9 100644 --- a/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_torus_parameters.cpp +++ b/Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_torus_parameters.cpp @@ -50,7 +50,7 @@ bool test_torus_parameters() { Efficient_ransac ransac; - ransac.add_shape_factory(); + ransac.template add_shape_factory(); ransac.set_input(points);