diff --git a/NewKernel_d/include/CGAL/NewKernel_d/KernelD_converter.h b/NewKernel_d/include/CGAL/NewKernel_d/KernelD_converter.h index bb56e8648da..c4ef7304d64 100644 --- a/NewKernel_d/include/CGAL/NewKernel_d/KernelD_converter.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/KernelD_converter.h @@ -93,7 +93,7 @@ class KernelD_converter_ //typedef typename KOC::argument_type K1_Obj; //typedef typename KOC::result_type K2_Obj; public: - void disp(const std::array &o) const // CJTODO DEBUG + /*void disp(const std::array &o) const // CJTODO DEBUG { std::cerr << o[0]; } @@ -101,7 +101,7 @@ class KernelD_converter_ void disp(const P &o) const // CJTODO DEBUG { std::cerr << o.point()[0] ; - } + }*/ using Base::operator(); // don't use directly, just make it accessible to the next level K2_Obj helper(K1_Obj const& o,CGAL_BOOSTD true_type)const{ return KOC()(this->myself().kernel(),this->myself().kernel2(),this->myself(),o); @@ -110,9 +110,9 @@ class KernelD_converter_ return K1_Conv(this->myself().kernel())(this->myself().kernel2(),this->myself(),o); } K2_Obj operator()(argument_type const& o)const{ - std::cerr << "KernelD_converter_::operator() "; // CJTODO DEBUG - disp(o); - std::cerr << std::endl; + //std::cerr << "KernelD_converter_::operator() "; // CJTODO DEBUG + //disp(o); + //std::cerr << std::endl; return helper(o,no_converter()); } template struct result:Base::template result{}; diff --git a/Triangulation/include/CGAL/Delaunay_triangulation.h b/Triangulation/include/CGAL/Delaunay_triangulation.h index 78dd0e06d01..ba8702c8ae7 100644 --- a/Triangulation/include/CGAL/Delaunay_triangulation.h +++ b/Triangulation/include/CGAL/Delaunay_triangulation.h @@ -86,7 +86,8 @@ protected: // DATA MEMBERS public: - + + using typename Base::Rotor; using Base::maximal_dimension; using Base::are_incident_full_cells_valid; using Base::coaffine_orientation_predicate; @@ -383,7 +384,7 @@ Delaunay_triangulation // THE CASE cur_dim >= 2 // Gather the finite vertices sharing an edge with |v| - typedef Base::Full_cell_set Simplices; + typedef typename Base::template Full_cell_set Simplices; Simplices simps; std::back_insert_iterator out(simps); tds().incident_full_cells(v, out); @@ -519,7 +520,7 @@ Delaunay_triangulation Dark_s_handle dark_ret_s = dark_s; Full_cell_handle ret_s; - typedef Base::Full_cell_set Dark_full_cells; + typedef typename Base::template Full_cell_set Dark_full_cells; Dark_full_cells conflict_zone; std::back_insert_iterator dark_out(conflict_zone); diff --git a/Triangulation/include/CGAL/Regular_triangulation.h b/Triangulation/include/CGAL/Regular_triangulation.h index 3e271b13998..f40f1c55bc5 100644 --- a/Triangulation/include/CGAL/Regular_triangulation.h +++ b/Triangulation/include/CGAL/Regular_triangulation.h @@ -91,7 +91,8 @@ protected: // DATA MEMBERS public: - + + using typename Base::Rotor; using Base::maximal_dimension; using Base::are_incident_full_cells_valid; using Base::coaffine_orientation_predicate; @@ -99,6 +100,8 @@ public: using Base::current_dimension; using Base::geom_traits; using Base::index_of_covertex; + using Base::index_of_second_covertex; + using Base::rotate_rotor; using Base::infinite_vertex; using Base::insert_in_hole; using Base::insert_outside_convex_hull_1; @@ -120,9 +123,6 @@ public: private: //*** Power_test_in_flat_d *** CJTODO: better name? - typedef typename Base::Flat_orientation_d Flat_orientation_d; - typedef typename Base::Construct_flat_orientation_d Construct_flat_orientation_d; - typedef typename RTTraits::In_flat_power_test_d In_flat_power_test_d; // Wrapper struct Power_test_in_flat_d { @@ -215,16 +215,16 @@ public: size_type n = number_of_vertices(); typedef std::vector WP_vec; WP_vec points(start, end); - Geom_traits::Point_drop_weight_d pdw = + typename Geom_traits::Point_drop_weight_d pdw = geom_traits().point_drop_weight_d_object(); spatial_sort( boost::make_transform_iterator(points.begin(), pdw), boost::make_transform_iterator(points.end(), pdw), - Geom_traits::Base()); + typename Geom_traits::Base()); //spatial_sort(points.begin(), points.end(), geom_traits()); // CJTODO TEMP A REMETTRE //spatial_sort(points.begin(), points.end(), Geom_traits::Base()); Full_cell_handle hint; - for(WP_vec::const_iterator p = points.begin(); p != points.end(); ++p ) + for(typename WP_vec::const_iterator p = points.begin(); p != points.end(); ++p ) { Locate_type lt; Face f(maximal_dimension()); @@ -408,7 +408,7 @@ Regular_triangulation // THE CASE cur_dim >= 2 // Gather the finite vertices sharing an edge with |v| - typedef Base::Full_cell_set Simplices; + typedef typename Base::template Full_cell_set Simplices; Simplices simps; std::back_insert_iterator out(simps); tds().incident_full_cells(v, out); @@ -548,7 +548,7 @@ Regular_triangulation Dark_s_handle dark_ret_s = dark_s; Full_cell_handle ret_s; - typedef Base::Full_cell_set Dark_full_cells; + typedef typename Base::template Full_cell_set Dark_full_cells; Dark_full_cells conflict_zone; std::back_insert_iterator dark_out(conflict_zone); @@ -885,4 +885,4 @@ Regular_triangulation } //namespace CGAL -#endif CGAL_REGULAR_TRIANGULATION_H +#endif //CGAL_REGULAR_TRIANGULATION_H diff --git a/Triangulation/include/CGAL/Regular_triangulation_euclidean_traits.h b/Triangulation/include/CGAL/Regular_triangulation_euclidean_traits.h index 074ca61e086..7a3f5e64487 100644 --- a/Triangulation/include/CGAL/Regular_triangulation_euclidean_traits.h +++ b/Triangulation/include/CGAL/Regular_triangulation_euclidean_traits.h @@ -52,6 +52,7 @@ public: typedef typename K::Power_test_d Power_test_d; typedef typename K::In_flat_power_test_d In_flat_power_test_d; typedef typename K::Flat_orientation_d Flat_orientation_d; + typedef typename K::Point_drop_weight_d Point_drop_weight_d; //============================================================================= // Custom types @@ -85,7 +86,7 @@ public: const K &m_kernel; public: - typedef typename Flat_orientation_d result_type; + typedef Flat_orientation_d result_type; Construct_flat_orientation_d(const K &kernel) : m_kernel(kernel) {}