diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/C3t3_io_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/C3t3_io_plugin.cpp index 326d2702f05..5e21aba3749 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/C3t3_io_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/C3t3_io_plugin.cpp @@ -405,12 +405,12 @@ struct Update_vertex typedef typename Tr1::Vertex V1; typedef typename Tr2::Vertex V2; typedef typename Tr2::Point Point; - + V2 operator()(const V1&) { return V2(); } - + bool operator()(const V1& v1, V2& v2) { v2.set_point(Point(v1.point())); @@ -432,9 +432,9 @@ struct Update_vertex }; // end struct Update_vertex struct Update_cell { - + typedef Fake_mesh_domain::Surface_patch_index Sp_index; - + template bool operator()(const C1& c1, C2& c2) { c2.set_subdomain_index(c1.subdomain_index()); @@ -472,9 +472,9 @@ struct Update_vertex_from_CDT_3 { }; // end struct Update_vertex struct Update_cell_from_CDT_3 { - + typedef Fake_mesh_domain::Surface_patch_index Sp_index; - + template void operator()(const C1& c1, C2& c2) { c2.set_subdomain_index(1); diff --git a/TDS_3/doc/TDS_3/Concepts/TriangulationDataStructure_3.h b/TDS_3/doc/TDS_3/Concepts/TriangulationDataStructure_3.h index a13840f6f79..081f9f98513 100644 --- a/TDS_3/doc/TDS_3/Concepts/TriangulationDataStructure_3.h +++ b/TDS_3/doc/TDS_3/Concepts/TriangulationDataStructure_3.h @@ -1022,8 +1022,8 @@ It also calls the `is_valid` member function of the cell. When `verbose` is set to `true`, messages are printed to give a precise indication on the kind of invalidity encountered. \cgalDebugEnd -*/ -bool is_valid(Cell_handle c, bool verbose = false) const; +*/ +bool is_valid(Cell_handle c, bool verbose = false) const; /// @} @@ -1031,13 +1031,13 @@ bool is_valid(Cell_handle c, bool verbose = false) const; /// @{ /*! \ingroup PkgIOTDS3 -Reads a combinatorial triangulation from `is` and assigns it to `tds` -*/ -istream& operator>> (istream& is, TriangulationDataStructure_3 & tds); +Reads a combinatorial triangulation from `is` and assigns it to `tds` +*/ +istream& operator>> (istream& is, TriangulationDataStructure_3 & tds); /*! \ingroup PkgIOTDS3 Writes `tds` into the stream `os` -*/ +*/ ostream& operator<< (ostream& os, const TriangulationDataStructure_3 & tds); /*! \ingroup PkgIOTDS3 diff --git a/Triangulation_3/doc/Triangulation_3/CGAL/Triangulation_3.h b/Triangulation_3/doc/Triangulation_3/CGAL/Triangulation_3.h index a6e6bb4fe44..e86c542c60d 100644 --- a/Triangulation_3/doc/Triangulation_3/CGAL/Triangulation_3.h +++ b/Triangulation_3/doc/Triangulation_3/CGAL/Triangulation_3.h @@ -1559,28 +1559,28 @@ ostream& operator<< (ostream& os, const Triangulation_3 &t); /*! \ingroup PkgIOTriangulation3 The triangulation streamed in `is`, of original type `Tr_src`, is written into the triangulation. As the vertex and cell - types might be different and incompatible, the creation of new cells and vertices -is made thanks to the functors `convert_vertex` and `convert_cell`, that convert + types might be different and incompatible, the creation of new cells and vertices +is made thanks to the functors `convert_vertex` and `convert_cell`, that convert vertex and cell types. For each vertex `v_src` in `is`, the corresponding -vertex `v_tgt` in the triangulation is a copy of the vertex returned by `convert_vertex(v_src)`. +vertex `v_tgt` in the triangulation is a copy of the vertex returned by `convert_vertex(v_src)`. The same operations are done for cells with the functor convert_cell, except cells in the triangulation are created using the default constructor, and then filled with the data contained in the stream. - A model of `ConvertVertex` must provide two `operator()`s that are responsible for converting the source vertex `v_src` into the target vertex: - - `Vertex operator()(const Tr_src::Vertex& v_src) const;` This operator is + - `Vertex operator()(const Tr_src::Vertex& v_src) const;` This operator is used to create the vertex from `v_src`. - `void operator()(const Tr_src::Vertex& v_src, Vertex& v_tgt) const;` This operator is meant to be used in case heavy data should be transferred to `v_tgt`. - - A model of ConvertCell must provide an operator() that is responsible for + - A model of ConvertCell must provide an operator() that is responsible for converting the source cell `c_src` into the target cell: - `void operator()(const Tr_src::Cell& c_src, Cell& c_tgt) const;` This operator is meant to be used in case data should be transferred to `c_tgt`. \note The triangulation contained in `is` can be obtained with the `operator>>` of a `Triangulation_3`. */ -template std::istream& file_input(std::istream& is, @@ -1589,7 +1589,7 @@ std::istream& file_input(std::istream& is, /// @} /// -/// \name Concurrency +/// \name Concurrency /// @{ /*! diff --git a/Triangulation_3/include/CGAL/Triangulation_3.h b/Triangulation_3/include/CGAL/Triangulation_3.h index 18aafd68ed3..c3f6e310f44 100644 --- a/Triangulation_3/include/CGAL/Triangulation_3.h +++ b/Triangulation_3/include/CGAL/Triangulation_3.h @@ -2196,9 +2196,9 @@ public: bool is_valid(bool verbose = false, int level = 0) const; bool is_valid(Cell_handle c, bool verbose = false, int level = 0) const; bool is_valid_finite(Cell_handle c, bool verbose = false, int level=0) const; - + //IO - template std::istream& file_input(std::istream& is, diff --git a/Triangulation_3/test/Triangulation_3/test_io_triangulation_3.cpp b/Triangulation_3/test/Triangulation_3/test_io_triangulation_3.cpp index 51e0d9a9355..a6e4694e5e1 100644 --- a/Triangulation_3/test/Triangulation_3/test_io_triangulation_3.cpp +++ b/Triangulation_3/test/Triangulation_3/test_io_triangulation_3.cpp @@ -19,12 +19,12 @@ struct Update_vertex typedef typename T1::Vertex V1; typedef typename T2::Vertex V2; typedef typename T2::Point Point; - + V2 operator()(const V1&) { return V2(); } - + void operator()(const V1& v1, V2& v2) { CGAL::Cartesian_converter c; @@ -32,7 +32,7 @@ struct Update_vertex } }; // end struct Update_vertex -struct Update_cell { +struct Update_cell { template void operator()(const C1&, C2&) {} }; // end struct Update_cell @@ -48,8 +48,8 @@ int main() std::ofstream out("tr"); out << T1; out.close(); - - Tr2 T2; + + Tr2 T2; std::ifstream in("tr"); T2.file_input, Update_cell>(in); in.close(); @@ -59,8 +59,8 @@ int main() assert(*(pit)++ == Tr2::Point(1,0,0)); assert(*(pit)++ == Tr2::Point(0,1,0)); assert(*(pit)++ == Tr2::Point(0,0,1)); - - + + std::cout << "done" << std::endl; return 0; }