diff --git a/BGL/include/CGAL/boost/graph/graph_traits_Linear_cell_complex.h b/BGL/include/CGAL/boost/graph/graph_traits_Linear_cell_complex.h index ef3f515416f..0a02b5ee91c 100644 --- a/BGL/include/CGAL/boost/graph/graph_traits_Linear_cell_complex.h +++ b/BGL/include/CGAL/boost/graph/graph_traits_Linear_cell_complex.h @@ -443,7 +443,7 @@ halfedge(typename boost::graph_traits::vertex_descriptor u, darts_of_cell<0>(const_cast(g).template beta<2>(u->dart())).end();*/ it!=itend; ++it) { - if (it->template attribute<0>()==v) + if (g.template attribute<0>(g.template beta<2>(it))==v) { return std::make_pair(it, true); // return std::make_pair(const_cast(g).template beta<2>(it), true); @@ -502,7 +502,7 @@ CGAL_LCC_TEMPLATE_ARGS bool is_valid(const CGAL_LCC_TYPE& cm, bool = false) { // cm.display_darts(std::cout,true); - return cm.is_valid(); // true to inverse the convention between darts and 0-attributes + return cm.is_valid(); } CGAL_LCC_TEMPLATE_ARGS @@ -534,6 +534,7 @@ void set_target(typename boost::graph_traits::halfedge_descriptor CGAL_LCC_TYPE& cm) { cm.template restricted_set_dart_attribute<0>(cm.template beta<2>(h1), v); + // cm.template restricted_set_dart_attribute<0>(h1, v); // cm.template set_dart_attribute<0>(h1, v); } diff --git a/BGL/test/BGL/test_Prefix.h b/BGL/test/BGL/test_Prefix.h index 8706320ccf1..cb570ef2313 100644 --- a/BGL/test/BGL/test_Prefix.h +++ b/BGL/test/BGL/test_Prefix.h @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include #include @@ -146,7 +146,7 @@ bool read_a_mesh(LCC& lcc, const std::string& str) { std::ifstream in(str.c_str()); bool success = in.good(); if(success) - CGAL::load_off(lcc, in); + CGAL::load_off_v2(lcc, in); return success; } diff --git a/Linear_cell_complex/include/CGAL/Linear_cell_complex_incremental_builder_v2.h b/Linear_cell_complex/include/CGAL/Linear_cell_complex_incremental_builder_v2.h index fd60e0c7ab2..6f0f354bf09 100644 --- a/Linear_cell_complex/include/CGAL/Linear_cell_complex_incremental_builder_v2.h +++ b/Linear_cell_complex/include/CGAL/Linear_cell_complex_incremental_builder_v2.h @@ -68,7 +68,7 @@ namespace CGAL { void add_vertex_to_facet(size_type i) { - // std::cout< "<< + lcc.darts().index(cur)< "<< + lcc.darts().index(first_dart)<(lcc.vertex_attribute(it), it); ++nb; } - } + }*/ return first_dart; }