From fe07a1973cb0a197fe8a9f83133471217ecdeaa7 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Fri, 2 Feb 2018 14:50:29 +0100 Subject: [PATCH] add doc in the right place. --- .../CGAL/Constrained_triangulation_2.h | 11 +++++++++++ .../include/CGAL/Constrained_triangulation_2.h | 5 ++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Triangulation_2/doc/Triangulation_2/CGAL/Constrained_triangulation_2.h b/Triangulation_2/doc/Triangulation_2/CGAL/Constrained_triangulation_2.h index a038cd60959..ff20d7f6390 100644 --- a/Triangulation_2/doc/Triangulation_2/CGAL/Constrained_triangulation_2.h +++ b/Triangulation_2/doc/Triangulation_2/CGAL/Constrained_triangulation_2.h @@ -9,6 +9,13 @@ Intersection tag for constrained triangulations, when input constraints do not i */ struct No_intersection_tag{}; +/*! +\ingroup PkgTriangulation2TriangulationClasses + +Intersection tag for constrained triangulations, when input constraints should not intersect. +Will throw a `To_be_renamed_exception` if constraints do intersect. +*/ +struct Throw_on_intersection_tag{}; /*! \ingroup PkgTriangulation2TriangulationClasses @@ -328,4 +335,8 @@ Note that `t` is first cleared. \relates Constrained_triangulation_2 */ istream& operator>>(istream& is,Constrained_triangulation_2 Ct& t); + +//! Exception thrown for `intersect()` when called with the tag `Throw_on_intersection_tag`. +//! Then, if constraints intersect, an exception of this type will be thrown. +class To_be_renamed_exception; } /* end namespace CGAL */ diff --git a/Triangulation_2/include/CGAL/Constrained_triangulation_2.h b/Triangulation_2/include/CGAL/Constrained_triangulation_2.h index 88ece78f27a..cb47535de53 100644 --- a/Triangulation_2/include/CGAL/Constrained_triangulation_2.h +++ b/Triangulation_2/include/CGAL/Constrained_triangulation_2.h @@ -105,8 +105,7 @@ public: }; - //! Exception thrown for `intersect()` when called with the tag `Throw_on_intersection_tag`. - class Is_intersecting_exception : public std::exception + class To_be_renamed_exception : public std::exception { const char* what() const throw () { @@ -897,7 +896,7 @@ intersect(Face_handle , int , Throw_on_intersection_tag) { - throw Is_intersecting_exception(); + throw To_be_renamed_exception(); return Vertex_handle() ; }