From f9c2cbf48d17b9f3e5fe7a477e1a6f29c041ad77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Fri, 5 Oct 2012 09:32:08 +0000 Subject: [PATCH] svn merge -c -72592 Phillip will manually do the update of the documentation in one pass. --- .../Concepts/EdgeProfile.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Surface_mesh_simplification/doc/Surface_mesh_simplification/Concepts/EdgeProfile.h b/Surface_mesh_simplification/doc/Surface_mesh_simplification/Concepts/EdgeProfile.h index d26f742ed94..ff04d6b7761 100644 --- a/Surface_mesh_simplification/doc/Surface_mesh_simplification/Concepts/EdgeProfile.h +++ b/Surface_mesh_simplification/doc/Surface_mesh_simplification/Concepts/EdgeProfile.h @@ -56,13 +56,13 @@ vertex_descriptor v1() const; One of the directed edges corresponding to the undirected edge being collapsed. */ -edge_descriptor v0_v1() const; +edge_descriptor v0v1() const; /*! The other directed edge corresponding to the undirected edge being collapsed. */ -edge_descriptor v1_v0() const; +edge_descriptor v1v0() const; /*! The point of vertex ` v0`. @@ -84,13 +84,13 @@ vertex_descriptor vL() const; If ` v0v1` belongs to a finite face (is not a border edge) the directed edge from ` v1` to ` vL`, a null descriptor otherwise. */ -edge_descriptor v1_vL() const; +edge_descriptor v1vL() const; /*! If ` v0v1` belongs to a finite face (is not a border edge) the directed edge from ` vL` to ` v0`, a null descriptor otherwise. */ -edge_descriptor vL_v0() const; +edge_descriptor vLv0() const; /*! If ` v1v0` belongs to a finite face (is not a border edge) @@ -102,13 +102,13 @@ vertex_descriptor vR() const; If ` v1v0` belongs to a finite face (is not a border edge) the directed edge from ` v0` to ` vR`, a null descriptor otherwise. */ -edge_descriptor v0_vR() const; +edge_descriptor v0vR() const; /*! If ` v1v0` belongs to a finite face (is not a border edge) the directed edge from ` vR` to ` v1`, a null descriptor otherwise. */ -edge_descriptor vR_v1() const; +edge_descriptor vRv1() const; /*! The unique sequence of the vertices