songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix indentation of class intersection 

Wrong indentation on nested classes made this tricky to decipher and
worth the change.
This commit is contained in:
Philipp Möller 2015-10-22 16:47:44 +02:00 committed by Sébastien Loriot
parent bec142d51f
commit 88acc3d1b3
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
AABB_tree/include/CGAL/AABB_traits.h
View File

@ -267,24 +267,24 @@ public:
Do_intersect do_intersect_object() const {return Do_intersect(*this);} Do_intersect do_intersect_object() const {return Do_intersect(*this);}
class Intersection { class Intersection {
const AABB_traits<GeomTraits,AABBPrimitive>& m_traits; const AABB_traits<GeomTraits,AABBPrimitive>& m_traits;
public: public:
Intersection(const AABB_traits<GeomTraits,AABBPrimitive>& traits) Intersection(const AABB_traits<GeomTraits,AABBPrimitive>& traits)
:m_traits(traits) {} :m_traits(traits) {}
#if CGAL_INTERSECTION_VERSION < 2 #if CGAL_INTERSECTION_VERSION < 2
template<typename Query> template<typename Query>
boost::optional<typename AT::Object_and_primitive_id> boost::optional<typename AT::Object_and_primitive_id>
operator()(const Query& query, const typename AT::Primitive& primitive) const operator()(const Query& query, const typename AT::Primitive& primitive) const
{ {
typedef boost::optional<Object_and_primitive_id> Intersection; typedef boost::optional<Object_and_primitive_id> Intersection;
CGAL::Object object = GeomTraits().intersect_3_object()(internal::Primitive_helper<AT>::get_datum(primitive,m_traits),query); CGAL::Object object = GeomTraits().intersect_3_object()(internal::Primitive_helper<AT>::get_datum(primitive,m_traits),query);
if ( object.empty() ) if ( object.empty() )
return Intersection(); return Intersection();
else else
return Intersection(Object_and_primitive_id(object,primitive.id())); return Intersection(Object_and_primitive_id(object,primitive.id()));
} }
#else #else
template<typename Query> template<typename Query>
boost::optional< typename Intersection_and_primitive_id<Query>::Type > boost::optional< typename Intersection_and_primitive_id<Query>::Type >
@ -292,13 +292,13 @@ operator()(const Query& query, const typename AT::Primitive& primitive) const
typename cpp11::result_of<typename GeomTraits::Intersect_3(Query, typename Primitive::Datum) >::type typename cpp11::result_of<typename GeomTraits::Intersect_3(Query, typename Primitive::Datum) >::type
inter_res = GeomTraits().intersect_3_object()(internal::Primitive_helper<AT>::get_datum(primitive,m_traits),query); inter_res = GeomTraits().intersect_3_object()(internal::Primitive_helper<AT>::get_datum(primitive,m_traits),query);
if (!inter_res) if (!inter_res)
return boost::optional<typename Intersection_and_primitive_id<Query>::Type>(); return boost::optional<typename Intersection_and_primitive_id<Query>::Type>();
return boost::make_optional( std::make_pair(*inter_res, primitive.id()) ); return boost::make_optional( std::make_pair(*inter_res, primitive.id()) );
} }
#endif #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 // This should go down to the GeomTraits, i.e. the kernel
class Closest_point { class Closest_point {