From df0e2ec0bc9463c76ca8ecb57b1a83f830f9c326 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 12 May 2009 14:29:36 +0000 Subject: [PATCH] size_type must be lowercase. --- AABB_tree/doc_tex/AABB_tree_ref/AABBTraits.tex | 2 +- AABB_tree/doc_tex/AABB_tree_ref/AABB_traits.tex | 2 +- AABB_tree/doc_tex/AABB_tree_ref/AABB_tree.tex | 6 +++--- AABB_tree/include/CGAL/AABB_traits.h | 2 +- AABB_tree/include/CGAL/AABB_tree.h | 12 ++++++------ 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/AABB_tree/doc_tex/AABB_tree_ref/AABBTraits.tex b/AABB_tree/doc_tex/AABB_tree_ref/AABBTraits.tex index 22e516fb1ea..28a099a8929 100644 --- a/AABB_tree/doc_tex/AABB_tree_ref/AABBTraits.tex +++ b/AABB_tree/doc_tex/AABB_tree_ref/AABBTraits.tex @@ -23,7 +23,7 @@ The concept \ccRefName\ provides the geometric primitive types and methods for t \ccTypes -\ccNestedType{Size_type}{Unsigned integral size type.} +\ccNestedType{size_type}{Unsigned integral size type.} \ccNestedType{FT}{Value type of the \ccc{Squared_distance} functor.} diff --git a/AABB_tree/doc_tex/AABB_tree_ref/AABB_traits.tex b/AABB_tree/doc_tex/AABB_tree_ref/AABB_traits.tex index 5000328be91..3708c1a2c09 100644 --- a/AABB_tree/doc_tex/AABB_tree_ref/AABB_traits.tex +++ b/AABB_tree/doc_tex/AABB_tree_ref/AABB_traits.tex @@ -40,7 +40,7 @@ The template parameter \ccc{GeomTraits} provides the geometric types as well as \ccTypedef{GeomTraits::Segment_3 Segment_3;} {Segment query type.} \ccGlue -\ccNestedType{Size_type}{Unsigned integral type.} +\ccNestedType{size_type}{Unsigned integral type.} \ccCreation \ccCreationVariable{traits} diff --git a/AABB_tree/doc_tex/AABB_tree_ref/AABB_tree.tex b/AABB_tree/doc_tex/AABB_tree_ref/AABB_tree.tex index 9c651834d21..5785a6e4237 100644 --- a/AABB_tree/doc_tex/AABB_tree_ref/AABB_tree.tex +++ b/AABB_tree/doc_tex/AABB_tree_ref/AABB_tree.tex @@ -25,7 +25,7 @@ Class \ccRefName\ is a static data structure for efficient intersection and dist \ccTypes -\ccTypedef{typedef AT::Size_type Size_type;} +\ccTypedef{typedef AT::size_type size_type;} {Unsigned integral size type.} \ccGlue \ccTypedef{typedef AT::FT FT;} @@ -70,7 +70,7 @@ Class \ccRefName\ is a static data structure for efficient intersection and dist \ccMethod{Bounding_box bbox();} {Returns the axis-aligned bounding box of the whole tree. } -\ccMethod{Size_type size();} +\ccMethod{size_type size();} {Returns the number of primitives in the tree. } \ccMethod{bool empty();} @@ -84,7 +84,7 @@ Class \ccRefName\ is a static data structure for efficient intersection and dist {Returns \ccc{true}, iff the query intersects at least one of the input primitives. Type \ccc{Query} must be a type for which \ccc{do_intersect} predicates are defined in the \ccc{AT} class.} \ccMethod{template - Size_type number_of_intersected_primitives(const Query& query);} + size_type number_of_intersected_primitives(const Query& query);} {Returns the number of primitives intersected by the query. Type \ccc{Query} must be a type for which \ccc{do_intersect} predicates are defined in the \ccc{AT} class.} %\ccMethod{template size_type number_of_transversal_intersections(const Query& query);} {Returns the number of primitives intersected transversally by the query, if all intersections are transversal. Type \ccc{Query} must be a type for which \ccc{do_transversally_intersect} predicates are defined in the \ccc{AT} class. If any of the intersections is not transversal, the method returns the error code (a negative integer) returned by \ccc{do_transversally_intersect} at the first non-transversal intersection encountered.} diff --git a/AABB_tree/include/CGAL/AABB_traits.h b/AABB_tree/include/CGAL/AABB_traits.h index 6d5e3f61e0b..c34d0eaa066 100644 --- a/AABB_tree/include/CGAL/AABB_traits.h +++ b/AABB_tree/include/CGAL/AABB_traits.h @@ -47,7 +47,7 @@ public: typedef AABB_primitive Primitive; typedef typename AABB_primitive::Datum Datum; // typedef typename GeomTraits::Sphere_3 Sphere; - typedef unsigned int Size_type; + typedef unsigned int size_type; // TOFIX: Workaround for weighted_point #ifndef AABB_KERNEL_USE_WEIGHTED_POINT diff --git a/AABB_tree/include/CGAL/AABB_tree.h b/AABB_tree/include/CGAL/AABB_tree.h index 335da7b5630..f7e663f7727 100644 --- a/AABB_tree/include/CGAL/AABB_tree.h +++ b/AABB_tree/include/CGAL/AABB_tree.h @@ -41,7 +41,7 @@ namespace CGAL { typedef typename AABBTraits::FT FT; typedef typename AABBTraits::Point Point; typedef typename AABBTraits::Primitive Primitive; - typedef typename AABBTraits::Size_type Size_type; + typedef typename AABBTraits::size_type size_type; typedef typename AABBTraits::Bounding_box Bounding_box; typedef typename AABBTraits::Point_and_primitive_id Point_and_primitive_id; typedef typename AABBTraits::Object_and_primitive_id Object_and_primitive_id; @@ -91,7 +91,7 @@ namespace CGAL { // bbox and size Bounding_box bbox() const { return m_p_root_node->bbox(); } - Size_type size() const { return m_primitives.size(); } + size_type size() const { return m_primitives.size(); } bool empty() const { return m_primitives.empty(); } /// Construct internal search tree with a given point set @@ -108,7 +108,7 @@ namespace CGAL { bool do_intersect(const Query& query) const; template - Size_type number_of_intersected_primitives(const Query& query) const; + size_type number_of_intersected_primitives(const Query& query) const; // all intersections template @@ -224,10 +224,10 @@ namespace CGAL { return AABBTraits().do_intersect_object()(query, node.bbox()); } - Size_type number_of_intersections() const { return m_nb_intersections; } + size_type number_of_intersections() const { return m_nb_intersections; } private: - Size_type m_nb_intersections; + size_type m_nb_intersections; }; @@ -513,7 +513,7 @@ namespace CGAL { template template - typename Tr::Size_type + typename Tr::size_type AABB_tree::number_of_intersected_primitives(const Query& query) const { Counting_traits traversal_traits;