From 8d92f10f234da82cb1ba1c8f4beea8078ea5d73c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20M=C3=B6ller?= Date: Thu, 25 Aug 2011 21:47:06 +0000 Subject: [PATCH] documented said hack, needs fixing --- Kernel_23/doc_tex/Kernel_23_ref/intersection.tex | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Kernel_23/doc_tex/Kernel_23_ref/intersection.tex b/Kernel_23/doc_tex/Kernel_23_ref/intersection.tex index 65b02be3ebc..05cf63bc25d 100644 --- a/Kernel_23/doc_tex/Kernel_23_ref/intersection.tex +++ b/Kernel_23/doc_tex/Kernel_23_ref/intersection.tex @@ -603,9 +603,8 @@ intersection(const Type1 &obj1, const Type2 &obj2, const Type3 &obj3, OutputIterator intersections);} {Copies in the output iterator the intersection elements between the three objects. \ccc{intersections} iterates on -elements of type \ccStyle{boost::optional< boost::variant< std::pair, unsigned>, -Circle_3, Sphere_3, Plane_3 >}, in lexicographic order -when this ordering is defined on the computed objects} +elements of type \ccStyle{boost::variant< Circle_3, Plane_3, Sphere_3, std::pair< Circular_arc_point_3, unsigned > >} +, in lexicographic order when this ordering is defined on the computed objects.} where \ccStyle{Type1}, \ccStyle{Type2} and \ccStyle{Type3} can be either @@ -614,7 +613,7 @@ can be either \item {} \ccStyle{Plane_3} \end{itemize} -and depending of these types, the computed return value +and depending of these types, the computed return value \begin{itemize} \item {} \ccStyle{std::pair, unsigned>}, where the unsigned integer is the multiplicity of the corresponding @@ -625,6 +624,9 @@ intersection point, and \ccc{obj3} are equal. \end{itemize} +A typedef for the result type is available through the traits class +\ccStyle{template Intersection_traits_spherical. + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ccExample