From 88acc3d1b32a74e36266375ed24963c23023b4e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20M=C3=B6ller?= Date: Thu, 22 Oct 2015 16:47:44 +0200 Subject: [PATCH] Fix indentation of class intersection Wrong indentation on nested classes made this tricky to decipher and worth the change. --- AABB_tree/include/CGAL/AABB_traits.h | 38 ++++++++++++++-------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/AABB_tree/include/CGAL/AABB_traits.h b/AABB_tree/include/CGAL/AABB_traits.h index 4a2189c9abb..0921b4c0f8d 100644 --- a/AABB_tree/include/CGAL/AABB_traits.h +++ b/AABB_tree/include/CGAL/AABB_traits.h @@ -267,24 +267,24 @@ public: Do_intersect do_intersect_object() const {return Do_intersect(*this);} -class Intersection { - const AABB_traits& m_traits; -public: - Intersection(const AABB_traits& traits) - :m_traits(traits) {} + class Intersection { + const AABB_traits& m_traits; + public: + Intersection(const AABB_traits& traits) + :m_traits(traits) {} #if CGAL_INTERSECTION_VERSION < 2 -template -boost::optional -operator()(const Query& query, const typename AT::Primitive& primitive) const -{ - typedef boost::optional Intersection; + template + boost::optional + operator()(const Query& query, const typename AT::Primitive& primitive) const + { + typedef boost::optional Intersection; - CGAL::Object object = GeomTraits().intersect_3_object()(internal::Primitive_helper::get_datum(primitive,m_traits),query); - if ( object.empty() ) - return Intersection(); - else - return Intersection(Object_and_primitive_id(object,primitive.id())); -} + CGAL::Object object = GeomTraits().intersect_3_object()(internal::Primitive_helper::get_datum(primitive,m_traits),query); + if ( object.empty() ) + return Intersection(); + else + return Intersection(Object_and_primitive_id(object,primitive.id())); + } #else template boost::optional< typename Intersection_and_primitive_id::Type > @@ -292,13 +292,13 @@ operator()(const Query& query, const typename AT::Primitive& primitive) const typename cpp11::result_of::type inter_res = GeomTraits().intersect_3_object()(internal::Primitive_helper::get_datum(primitive,m_traits),query); if (!inter_res) - return boost::optional::Type>(); + return boost::optional::Type>(); return boost::make_optional( std::make_pair(*inter_res, primitive.id()) ); } #endif -}; + }; -Intersection intersection_object() const {return Intersection(*this);} + Intersection intersection_object() const {return Intersection(*this);} // This should go down to the GeomTraits, i.e. the kernel class Closest_point {