diff --git a/Alpha_shapes_2/include/CGAL/Weighted_alpha_shape_euclidean_traits_2.h b/Alpha_shapes_2/include/CGAL/Weighted_alpha_shape_euclidean_traits_2.h index 55f1ca124cb..f6e3afa37ce 100644 --- a/Alpha_shapes_2/include/CGAL/Weighted_alpha_shape_euclidean_traits_2.h +++ b/Alpha_shapes_2/include/CGAL/Weighted_alpha_shape_euclidean_traits_2.h @@ -32,6 +32,7 @@ template< class K_ > class Weighted_alpha_shape_euclidean_traits_2 : public K_ { +public: Weighted_alpha_shape_euclidean_traits_2() { } Weighted_alpha_shape_euclidean_traits_2(const K_& k) : K_(k) { } }; diff --git a/Alpha_shapes_3/include/CGAL/Weighted_alpha_shape_euclidean_traits_3.h b/Alpha_shapes_3/include/CGAL/Weighted_alpha_shape_euclidean_traits_3.h index c096f5e480b..26b71c2c137 100644 --- a/Alpha_shapes_3/include/CGAL/Weighted_alpha_shape_euclidean_traits_3.h +++ b/Alpha_shapes_3/include/CGAL/Weighted_alpha_shape_euclidean_traits_3.h @@ -31,6 +31,7 @@ template < class K_ > class Weighted_alpha_shape_euclidean_traits_3 : public K_ { +public: Weighted_alpha_shape_euclidean_traits_3() { } Weighted_alpha_shape_euclidean_traits_3(const K_& k) : K_(k) { } }; diff --git a/Kernel_23/doc/Kernel_23/CGAL/Weighted_point_2.h b/Kernel_23/doc/Kernel_23/CGAL/Weighted_point_2.h index e490c7ee381..92e9fc8e70f 100644 --- a/Kernel_23/doc/Kernel_23/CGAL/Weighted_point_2.h +++ b/Kernel_23/doc/Kernel_23/CGAL/Weighted_point_2.h @@ -51,7 +51,7 @@ public: \warning The `explicit` keyword is used to avoid accidental implicit conversions between Point_2 and Weighted_point_2. */ - Weighted_point_2(const Point_2& p); + explicit Weighted_point_2(const Point_2& p); /*! introduces a weighted point from point `p` and weight `w`. diff --git a/Kernel_23/include/CGAL/Kernel/function_objects.h b/Kernel_23/include/CGAL/Kernel/function_objects.h index 1edc9043f9a..073911217a3 100644 --- a/Kernel_23/include/CGAL/Kernel/function_objects.h +++ b/Kernel_23/include/CGAL/Kernel/function_objects.h @@ -432,11 +432,12 @@ namespace CommonKernelFunctors { K traits; typename K::Orientation_3 orientation = traits.orientation_3_object(); typename K::Construct_point_3 wp2p = traits.construct_point_3_object(); - typename K::Power_side_of_oriented_power_sphere_3 power_test = traits.power_side_of_oriented_power_sphere_3_object(); + typename K::Power_side_of_oriented_power_sphere_3 power_test = + traits.power_side_of_oriented_power_sphere_3_object(); typename K::Orientation o = orientation(wp2p(p),wp2p(q),wp2p(r),wp2p(s)); typename K::Oriented_side os = power_test(p,q,r,s,t); - // power_test_3 - // returns in fact minus the 5x5 determinant of lifted (p,q,r,s.t) + // Power_side_of_oriented_power_sphere_3 + // returns in fact minus the 5x5 determinant of lifted (p,q,r,s,t) CGAL_assertion(o != COPLANAR); return enum_cast(o * os); } diff --git a/Polyhedron/demo/Polyhedron/Scene_c3t3_item.cpp b/Polyhedron/demo/Polyhedron/Scene_c3t3_item.cpp index 797fad887cd..a5ce4617b47 100644 --- a/Polyhedron/demo/Polyhedron/Scene_c3t3_item.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_c3t3_item.cpp @@ -636,9 +636,9 @@ Scene_c3t3_item::graphicalToolTip() const std::vector create_histogram(const C3t3& c3t3, double& min_value, double& max_value) { - typename Geom_traits::Compute_approximate_dihedral_angle_3 approx_dihedral_angle + Geom_traits::Compute_approximate_dihedral_angle_3 approx_dihedral_angle = c3t3.triangulation().geom_traits().compute_approximate_dihedral_angle_3_object(); - typename Geom_traits::Construct_point_3 wp2p + Geom_traits::Construct_point_3 wp2p = c3t3.triangulation().geom_traits().construct_point_3_object(); std::vector histo(181, 0); @@ -646,7 +646,7 @@ create_histogram(const C3t3& c3t3, double& min_value, double& max_value) min_value = 180.; max_value = 0.; - for (typename C3t3::Cells_in_complex_iterator cit = c3t3.cells_in_complex_begin(); + for (C3t3::Cells_in_complex_iterator cit = c3t3.cells_in_complex_begin(); cit != c3t3.cells_in_complex_end(); ++cit) { @@ -1178,7 +1178,7 @@ void Scene_c3t3_item::export_facets_in_complex() std::vector > polygons(c3t3().number_of_facets_in_complex()); std::size_t index = 0; - typename Geom_traits::Construct_point_3 wp2p + Geom_traits::Construct_point_3 wp2p = c3t3().triangulation().geom_traits().construct_point_3_object(); BOOST_FOREACH(C3t3::Vertex_handle v, vertex_set) @@ -1402,7 +1402,7 @@ void Scene_c3t3_item_priv::initializeBuffers(CGAL::Three::Viewer_interface *view void Scene_c3t3_item_priv::computeIntersection(const Primitive& facet) { - typename Geom_traits::Construct_point_3 wp2p + Geom_traits::Construct_point_3 wp2p = c3t3.triangulation().geom_traits().construct_point_3_object(); Tr::Cell_handle ch = facet.id().first; @@ -1477,7 +1477,7 @@ void Scene_c3t3_item_priv::computeIntersections() void Scene_c3t3_item_priv::computeSpheres() { - typename Geom_traits::Construct_point_3 wp2p + Geom_traits::Construct_point_3 wp2p = c3t3.triangulation().geom_traits().construct_point_3_object(); if(!spheres) @@ -1558,7 +1558,7 @@ void Scene_c3t3_item_priv::computeElements() //The facets { - typename Geom_traits::Construct_point_3 wp2p + Geom_traits::Construct_point_3 wp2p = c3t3.triangulation().geom_traits().construct_point_3_object(); for (C3t3::Facet_iterator @@ -1799,7 +1799,7 @@ bool Scene_c3t3_item::keyPressEvent(QKeyEvent *event) QString Scene_c3t3_item::computeStats(int type) { - typename Geom_traits::Construct_point_3 wp2p + Geom_traits::Construct_point_3 wp2p = d->c3t3.triangulation().geom_traits().construct_point_3_object(); if(!d->computed_stats) diff --git a/Triangulation_2/include/CGAL/Regular_triangulation_2.h b/Triangulation_2/include/CGAL/Regular_triangulation_2.h index d6acef6091a..fc7a00e66a3 100644 --- a/Triangulation_2/include/CGAL/Regular_triangulation_2.h +++ b/Triangulation_2/include/CGAL/Regular_triangulation_2.h @@ -50,8 +50,8 @@ template < class Gt, class Regular_triangulation_2 : public Triangulation_2 { - typedef Regular_triangulation_2 Self; - typedef Triangulation_2 Base; + typedef Regular_triangulation_2 Self; + typedef Triangulation_2 Base; public: typedef Self Triangulation;